From 4a9e3512c58627b42fc82f4f2283e2ba0064637f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 17:26:44 +0200
Subject: [PATCH 001/397] [ADD] mail: added mail.subscription.hide model. This
 will holds the hiden notification subtypes.

bzr revid: tde@openerp.com-20120419152644-u3t5y18s0w7r5ton
---
 addons/mail/mail_subscription.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index fc82af879a9..2b6a8dd5342 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -44,6 +44,25 @@ class mail_subscription(osv.osv):
                         ondelete='cascade', required=True, select=1),
     }
 
+class mail_subscription_hide(osv.osv):
+    """
+    mail_subscription_hide holds the data to store the hiden notifications
+    on the Wall. Hide choices are related to a subscription, not a model
+    or a user.
+        :param: subscription_id: the related subscription
+        :param: subtype: the message subtype hiden
+    """
+    _name = 'mail.subscription.hide'
+    _rec_name = 'id'
+    _order = 'id desc'
+    _description = 'Hidden subscription'
+    _columns = {
+        'subscription_id': fields.many2one('mail.subscription', string='Subscription',
+                        ondelete='cascade', required=True, select=1),
+        'subtype': fields.char('Message subtype', size=64,
+                        required=True, help='Message subtype is a string that depends on the related model.'),
+    }
+
 class mail_notification(osv.osv):
     """
     mail_notification is a relational table modeling messages pushed to users.

From 491e8ad9f6192278ee386d6a721f8c810009d581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 17:38:25 +0200
Subject: [PATCH 002/397] [ADD] mail.subscription.hide: added views and menu
 entry.

bzr revid: tde@openerp.com-20120419153825-xodlfiotdgdmco30
---
 addons/mail/mail_subscription_view.xml | 36 +++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 52b72127b78..827c23b25d2 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -20,6 +20,23 @@
             </field>
         </record>
 
+        <!-- 
+            SUBSCRIPTION HIDE
+                !-->
+        
+        <record model="ir.ui.view" id="view_subscription_hide_tree">
+            <field name="name">mail.subscription.hide.tree</field>
+            <field name="model">mail.subscription.hide</field>
+            <field name="type">tree</field>
+            <field name="sequence">10</field>
+            <field name="arch" type="xml">
+                <tree string="Hidden subscriptions">
+                    <field name="subscription_id"/>
+                    <field name="subtype"/>
+                </tree>
+            </field>
+        </record>
+
         <!-- 
             NOTIFICATION
                 !-->
@@ -45,6 +62,13 @@
             <field name="view_mode">tree,form</field>
         </record>
 
+        <record id="action_view_subscription_hide" model="ir.actions.act_window">
+            <field name="name">Hidden subscriptions</field>
+            <field name="res_model">mail.subscription.hide</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
         <record id="action_view_notifications" model="ir.actions.act_window">
             <field name="name">Pushed notif</field>
             <field name="res_model">mail.notification</field>
@@ -52,11 +76,15 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Subscriptions" id="menu_email_subscriptions" parent="base.menu_email" action="action_view_subscriptions" sequence="30" groups="base.group_no_one"/>
+        <!-- Add subscriptions related menu entries in Settings/Email -->
+        <menuitem name="Subscriptions" id="menu_email_subscriptions" parent="base.menu_email"
+                    action="action_view_subscriptions" sequence="30" groups="base.group_no_one"/>
+        <menuitem name="Hidden subscriptions" id="menu_email_subscriptions_hide" parent="base.menu_email"
+                    action="action_view_subscription_hide" sequence="31" groups="base.group_no_one"/>
         
-        <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email" action="action_view_notifications" sequence="31" groups="base.group_no_one"/>
+        <!-- Add notifications related menu entry in Settings/Email -->
+        <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email"
+                    action="action_view_notifications" sequence="35" groups="base.group_no_one"/>
 
     </data>
 </openerp>

From ae0dbd21455e8a6ef2d358b8999fba49674fd497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 17:53:39 +0200
Subject: [PATCH 003/397] [ADD] mail.group: added a 'models' field, to link
 groups to models. Purpose: group will be able to aggregate messages, and
 users following the group will receive notifications. Example: being able to
 follow all leads.

bzr revid: tde@openerp.com-20120419155339-etlzmi5jo5d8iwgf
---
 addons/mail/mail_group.py       | 2 ++
 addons/mail/mail_group_view.xml | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 0a8677d7862..83d0705c4e0 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -119,6 +119,8 @@ class mail_group(osv.osv):
                             ondelete='set null', required=True, select=1,
                             help="Responsible of the group that has all rights on the record."),
         'public': fields.boolean('Public', help='This group is visible by non members. Invisible groups can add members through the invite button.'),
+        'models': fields.many2many('ir.model', rel='mail_group_models_rel', id1='mail_group_id', id2='model_id',
+                            string='Linked models', help='Linked models'),
         'photo_big': fields.binary('Full-size photo', help='Field holding the full-sized PIL-supported and base64 encoded version of the group image. The photo field is used as an interface for this field.'),
         'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Photo', type="binary",
             store = {
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index ea0dede377d..d911b4a7deb 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -58,6 +58,11 @@
                             <field name="responsible_id" colspan="2"/>
                             <newline/>
                             <field name="description" colspan="4"/>
+                            <field name="models" colspan="4">
+                                <tree string="Document models">
+                                    <field name="name"/>
+                                </tree>
+                            </field>
                         </group>
                         <group colspan="1" col="2">
                             <separator string="Group image" colspan="2"/>

From caba5db34bb9d6a4f91127c063293aae3be13780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 18:20:50 +0200
Subject: [PATCH 004/397] [ADD] mail.message: added a message_subtype field,
 that will contain more precise data about the type of content. Example:
 create, cancel, ... Purpose: being able to filter (hide) a given content
 type.

bzr revid: tde@openerp.com-20120419162050-6uq495s94i4etnbp
---
 addons/mail/mail_message.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 5d5d599be0e..9228861b139 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -206,6 +206,12 @@ class mail_message(osv.osv):
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
+        'message_subtype': fields.selection([
+                        ('email', 'e-mail'),
+                        ('comment', 'Comment'),
+                        ('create', 'Create'),
+                        ('cancel', 'Cancel'),
+                        ], 'Type', help="Message subtype, such as create or cancel. May be overriden by addons."),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related user', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -224,6 +230,7 @@ class mail_message(osv.osv):
         
     _defaults = {
         'type': 'email',
+        'message_subtype': 'email',
         'state': 'received',
     }
     

From 7a4ca1338c43b63c4d7976519ffe7a374d922fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 10:42:41 +0200
Subject: [PATCH 005/397] [ADD] Chatter widget: added links to hide a thread or
 a subtype. Only links, not functional currently, because logic is not
 implemented.

bzr revid: tde@openerp.com-20120420084241-02l4tfifzxjd88go
---
 addons/mail/static/src/css/mail.css | 31 ++++++++++++++++++++++++++++
 addons/mail/static/src/js/mail.js   | 32 +++++++++++++++++++++++++++++
 addons/mail/static/src/xml/mail.xml |  6 ++++++
 3 files changed, 69 insertions(+)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7f0cc6f222c..5bae0d5e73b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -167,6 +167,7 @@
 }
 
 .openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
+    position: relative;
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -229,6 +230,36 @@
     color: #4E43E7;
 }
 
+.openerp img.oe_mail_msg_menu_icon {
+    float: right;
+    cursor: pointer;
+}
+
+.openerp ul.oe_mail_msg_menu {
+/*
+    display: none;
+*/
+    display: block;
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    overflow-x: hidden;
+    z-index: 900;
+    background: white;
+    padding: 4px;
+    border: 1px solid #AFAFB6;
+    width: 150px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+
 /* ------------------------------ */
 /* Styling (should be openerp)    */
 /* ------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d99674f98a7..160a1dc33fd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -174,6 +174,34 @@ openerp.mail = function(session) {
                 }
                 return false;
             });
+            // event: click on 'hide notification' in wheel_menu
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_thread', 'click', function (event) {
+                console.log('hiding notification');
+                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
+                var msg_id = event.srcElement.dataset.id;
+                if (! msg_id) return false;
+                console.log(msg_id);
+                //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                if (self.params.thread_level > 0) {
+                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                }
+                return false;
+            });
+            // event: click on 'hide this type' in wheel_menu
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
+                console.log('hiding type');
+                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
+                var msg_id = event.srcElement.dataset.id;
+                if (! msg_id) return false;
+                console.log(msg_id);
+                //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                if (self.params.thread_level > 0) {
+                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                }
+                return false;
+            });
             // event: click on an internal link
             this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) {
                 // lazy implementation: fetch data and try to redirect
@@ -193,6 +221,10 @@ openerp.mail = function(session) {
                 }
                 else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
             });
+            // event: click on the wheel menu in messages
+            this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) {
+                self.$element.find('ul.oe_mail_msg_menu').toggle();
+            });
         },
         
         destroy: function () {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f034b04311d..7fe1d39a661 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -58,6 +58,12 @@
 
     <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
+            <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
+            <ul class="oe_mail_msg_menu">
+                <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
+                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.message_subtype"/>
+                </a></li>
+            </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>

From 318ef517ab037bafba43c2e5d85301f0f88432c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 11:36:45 +0200
Subject: [PATCH 006/397] [REF] mail.message.common model: renamed subtype to
 content_subtype. Purpose: make a distinction between content and message
 model. Type and subtype will be used to distinguish messages, content_subtype
 to distinguish the content itself.

bzr revid: tde@openerp.com-20120420093645-tt78zzrmq2nxomvb
---
 addons/base_calendar/base_calendar.py      |  2 +-
 addons/crm/wizard/mail_compose_message.py  |  2 +-
 addons/email_template/email_template.py    |  4 +-
 addons/mail/mail_message.py                | 78 ++++++++++++----------
 addons/mail/mail_message_view.xml          |  4 +-
 addons/mail/mail_thread.py                 | 22 +++---
 addons/mail/wizard/mail_compose_message.py | 12 ++--
 7 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4dffd8bcbf8..09033bffa84 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -515,7 +515,7 @@ property or property parameter."),
                         sub,
                         body,
                         attachments=attach and {'invitation.ics': attach} or None,
-                        subtype='html',
+                        content_subtype='html',
                         reply_to=email_from,
                         context=context
                     )
diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py
index b82c3083f3a..11d340b2f76 100644
--- a/addons/crm/wizard/mail_compose_message.py
+++ b/addons/crm/wizard/mail_compose_message.py
@@ -54,7 +54,7 @@ class mail_compose_message(osv.osv_memory):
                     'email_cc' : tools.ustr(data.email_cc or ''),
                     'model': model,
                     'res_id': res_id,
-                    'subtype': 'plain',
+                    'content_subtype': 'plain',
                 })
             if hasattr(data, 'section_id'):
                 result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 86f136ca5b9..31bf9a76441 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -310,7 +310,7 @@ class email_template(osv.osv):
                   'attachment_ids': False,
                   'message_id': False,
                   'state': 'outgoing',
-                  'subtype': 'plain',
+                  'content_subtype': 'plain',
         }
         if not template_id:
             return values
@@ -326,7 +326,7 @@ class email_template(osv.osv):
                                                  or False
 
         if values['body_html']:
-            values.update(subtype='html')
+            values.update(content_subtype='html')
 
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 9228861b139..1595fbae077 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -63,18 +63,21 @@ def to_email(text):
     if not text: return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
-class mail_message_common(osv.osv_memory):
+class mail_message_common(osv.TransientModel):
     """Common abstract class for holding the main attributes of a 
        message object. It could be reused as parent model for any
        database model or wizard screen that needs to hold a kind of
-       message"""
+       message.
+       All internal logic should be in a database-based model. For example,
+       a wizard for writing emails should inherit from this class and not
+       from mail.message."""
 
     def get_body(self, cr, uid, ids, name, arg, context=None):
         if context is None:
             context = {}
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
-            if message.subtype == 'html':
+            if message.content_subtype == 'html':
                 result[message.id] = message.body_html
             else:
                 result[message.id] = message.body_text
@@ -85,7 +88,7 @@ class mail_message_common(osv.osv_memory):
            - obj: mail.message object
            - name: 'body'
            - args: [('body', 'ilike', 'blah')]"""
-        return ['|', '&', ('subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
+        return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
     
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
         if context is None:
@@ -115,19 +118,20 @@ class mail_message_common(osv.osv_memory):
                         help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to "
-                                                             "select plaintext or rich text contents accordingly", readonly=1),
+        'content_subtype': fields.char('Message content subtype', size=32,
+                                            help="Type of message, usually 'html' or 'plain', used to "
+                                                 "select plain-text or rich-text contents accordingly", readonly=1),
         'body_text': fields.text('Text contents', help="Plain-text version of the message"),
         'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text',
-                        help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
+                        help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message content_subtype."),
         'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy",
                         select=True, ondelete='set null',),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child messages'),
     }
 
     _defaults = {
-        'subtype': 'plain',
+        'content_subtype': 'plain',
         'date': (lambda *a: fields.datetime.now()),
     }
 
@@ -206,12 +210,12 @@ class mail_message(osv.osv):
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
-        'message_subtype': fields.selection([
+        'message_tmptype': fields.selection([
                         ('email', 'e-mail'),
                         ('comment', 'Comment'),
                         ('create', 'Create'),
                         ('cancel', 'Cancel'),
-                        ], 'Type', help="Message subtype, such as create or cancel. May be overriden by addons."),
+                        ], 'Type', help="Message temptype, such as create or cancel. May be overriden by addons."),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related user', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -230,7 +234,7 @@ class mail_message(osv.osv):
         
     _defaults = {
         'type': 'email',
-        'message_subtype': 'email',
+        'message_tmptype': 'email',
         'state': 'received',
     }
     
@@ -250,18 +254,18 @@ class mail_message(osv.osv):
         default.update(message_id=False,original=False,headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
 
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
-                             email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
-                             context=None):
+    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False,
+                             email_cc=None, email_bcc=None, reply_to=False, attachments=None,
+                             message_id=False, references=False, res_id=False, content_subtype='plain',
+                             headers=None, mail_server_id=False, auto_delete=False, context=None):
         """Schedule sending a new email message, to be sent the next time the mail scheduler runs, or
            the next time :meth:`process_email_queue` is called explicitly.
 
            :param string email_from: sender email address
            :param list email_to: list of recipient addresses (to be joined with commas) 
            :param string subject: email subject (no pre-encoding/quoting necessary)
-           :param string body: email body, according to the ``subtype`` (by default, plaintext).
-                               If html subtype is used, the message will be automatically converted
+           :param string body: email body, according to the ``content_subtype`` 
+                               (by default, plaintext). If html content_subtype is used, the message will be automatically converted
                                to plaintext and wrapped in multipart/alternative.
            :param list email_cc: optional list of string values for CC header (to be joined with commas)
            :param list email_bcc: optional list of string values for BCC header (to be joined with commas)
@@ -272,9 +276,9 @@ class mail_message(osv.osv):
                               be used to generate a tracking id, used to match any response related to the
                               same document)
            :param string reply_to: optional value of Reply-To header
-           :param string subtype: optional mime subtype for the text body (usually 'plain' or 'html'),
-                                  must match the format of the ``body`` parameter. Default is 'plain',
-                                  making the content part of the mail "text/plain".
+           :param string content_subtype: optional mime content_subtype for the text body (usually 'plain' or 'html'),
+                                       must match the format of the ``body`` parameter. Default is 'plain',
+                                       making the content part of the mail "text/plain".
            :param dict attachments: map of filename to filecontents, where filecontents is a string
                                     containing the bytes of the attachment
            :param dict headers: optional map of headers to set on the outgoing mail (may override the
@@ -299,8 +303,8 @@ class mail_message(osv.osv):
                 'model': model,
                 'res_id': res_id,
                 'type': 'email',
-                'body_text': body if subtype != 'html' else False,
-                'body_html': body if subtype == 'html' else False,
+                'body_text': body if content_subtype != 'html' else False,
+                'body_html': body if content_subtype == 'html' else False,
                 'email_from': email_from,
                 'email_to': email_to and ','.join(email_to) or '',
                 'email_cc': email_cc and ','.join(email_cc) or '',
@@ -308,7 +312,7 @@ class mail_message(osv.osv):
                 'reply_to': reply_to,
                 'message_id': message_id,
                 'references': references,
-                'subtype': subtype,
+                'content_subtype': content_subtype,
                 'headers': headers, # serialize the dict on the fly
                 'mail_server_id': mail_server_id,
                 'state': 'outgoing',
@@ -388,7 +392,7 @@ class mail_message(osv.osv):
                       'headers' : { 'X-Mailer': mailer,
                                     #.. all X- headers...
                                   },
-                      'subtype': msg_mime_subtype,
+                      'content_subtype': msg_mime_subtype,
                       'body_text': plaintext_body
                       'body_html': html_body,
                       'attachments': [('file1', 'bytes'),
@@ -464,7 +468,7 @@ class mail_message(osv.osv):
             msg['in-reply-to'] = msg_txt.get('In-Reply-To')
 
         msg['headers'] = {}
-        msg['subtype'] = 'plain'
+        msg['content_subtype'] = 'plain'
         for item in msg_txt.items():
             if item[0].startswith('X-'):
                 msg['headers'].update({item[0]: item[1]})
@@ -473,7 +477,7 @@ class mail_message(osv.osv):
             body = msg_txt.get_payload(decode=True)
             if 'text/html' in msg.get('content-type', ''):
                 msg['body_html'] =  body
-                msg['subtype'] = 'html'
+                msg['content_subtype'] = 'html'
                 if body:
                     body = tools.html2plaintext(body)
             msg['body_text'] = tools.ustr(body, encoding)
@@ -482,9 +486,9 @@ class mail_message(osv.osv):
         if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
             body = ""
             if 'multipart/alternative' in msg.get('content-type', ''):
-                msg['subtype'] = 'alternative'
+                msg['content_subtype'] = 'alternative'
             else:
-                msg['subtype'] = 'mixed'
+                msg['content_subtype'] = 'mixed'
             for part in msg_txt.walk():
                 if part.get_content_maintype() == 'multipart':
                     continue
@@ -498,7 +502,7 @@ class mail_message(osv.osv):
                     content = tools.ustr(content, encoding)
                     if part.get_content_subtype() == 'html':
                         msg['body_html'] = content
-                        msg['subtype'] = 'html' # html version prevails
+                        msg['content_subtype'] = 'html' # html version prevails
                         body = tools.ustr(tools.html2plaintext(content))
                         body = body.replace('&#13;', '')
                     elif part.get_content_subtype() == 'plain':
@@ -515,7 +519,7 @@ class mail_message(osv.osv):
 
         # for backwards compatibility:
         msg['body'] = msg['body_text']
-        msg['sub_type'] = msg['subtype'] or 'plain'
+        msg['sub_type'] = msg['content_subtype'] or 'plain'
         return msg
 
     def _postprocess_sent_message(self, cr, uid, message, context=None):
@@ -561,15 +565,17 @@ class mail_message(osv.osv):
                 for attach in message.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
 
-                body = message.body_html if message.subtype == 'html' else message.body_text
+                body = message.body_html if message.content_subtype == 'html' else message.body_text
                 body_alternative = None
-                subtype_alternative = None
-                if message.subtype == 'html' and message.body_text:
+                content_subtype_alternative = None
+                if message.content_subtype == 'html' and message.body_text:
                     # we have a plain text alternative prepared, pass it to 
                     # build_message instead of letting it build one
                     body_alternative = message.body_text
-                    subtype_alternative = 'plain'
+                    content_subtype_alternative = 'plain'
 
+                # build an RFC2822 email.message.Message object adn send it
+                # without queuing
                 msg = ir_mail_server.build_email(
                     email_from=message.email_from,
                     email_to=to_email(message.email_to),
@@ -582,8 +588,8 @@ class mail_message(osv.osv):
                     attachments=attachments, message_id=message.message_id,
                     references = message.references,
                     object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
-                    subtype=message.subtype,
-                    subtype_alternative=subtype_alternative,
+                    subtype=message.content_subtype,
+                    subtype_alternative=content_subtype_alternative,
                     headers=message.headers and ast.literal_eval(message.headers))
                 res = ir_mail_server.send_email(cr, uid, msg,
                                                 mail_server_id=message.mail_server_id.id,
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index ecd106e05e5..1a7d511de3b 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -103,7 +103,7 @@
                                 <field name="references" colspan="4" widget="char" size="512" groups="base.group_extended" attrs="{'invisible':[('references', '=', False)]}"/>
                             </group>
                             <notebook colspan="4">
-                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                <page string="Body (Rich)" attrs="{'invisible':[('content_subtype','=','plain')]}">
                                     <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
                                 </page>
                                 <page string="Body (Plain)">
@@ -113,7 +113,7 @@
                             <separator string="" colspan="4"/>
                             <group col="6" colspan="6">
                                 <field name="state" colspan="2"/>
-                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                <field name="content_subtype" attrs="{'invisible':[('content_subtype', '=', False)]}"/>
                                 <group colspan="2">
                                     <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                     context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8cd8ef415c3..c8ffff25fd9 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -130,7 +130,7 @@ class mail_thread(osv.osv):
         subscription_obj = self.pool.get('mail.subscription')
         notification_obj = self.pool.get('mail.notification')
         res_users_obj = self.pool.get('res.users')
-        body = vals.get('body_html', '') if vals.get('subtype', 'plain') == 'html' else vals.get('body_text', '')
+        body = vals.get('body_html', '') if vals.get('content_subtype') == 'html' else vals.get('body_text', '')
         
         # automatically subscribe the writer of the message
         if vals['user_id']:
@@ -178,7 +178,7 @@ class mail_thread(osv.osv):
             context = {}
         
         notif_user_ids = []
-        body = new_msg_vals.get('body_html', '') if new_msg_vals.get('subtype', 'plain') == 'html' else new_msg_vals.get('body_text', '')
+        body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         for thread_id in thread_ids:
             # add subscribers
             notif_user_ids += [user['id'] for user in self.message_get_subscribers(cr, uid, [thread_id], context=context)]
@@ -218,7 +218,7 @@ class mail_thread(osv.osv):
         return ret_dict
 
     def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        parent_id=False, type='email', subtype='plain', state='received',
+                        parent_id=False, type='email', content_subtype='plain', state='received',
                         email_to=False, email_from=False, email_cc=None, email_bcc=None,
                         reply_to=None, email_date=None, message_id=False, references=None,
                         attachments=None, headers=None, original=None, context=None):
@@ -240,7 +240,7 @@ class mail_thread(osv.osv):
         :param body_html: html contents of the mail or log message
         :param parent_id: id of the parent message (threaded messaging model)
         :param type: optional type of message: 'email', 'comment', 'notification'
-        :param subtype: optional subtype of message: 'plain' or 'html', corresponding to the main
+        :param content_subtype: optional content_subtype of message: 'plain' or 'html', corresponding to the main
                         body contents (body_text or body_html).
         :param state: optional state of message; 'received' by default
         :param email_to: Email-To / Recipient address
@@ -304,7 +304,7 @@ class mail_thread(osv.osv):
                 'parent_id': parent_id,
                 'date': email_date or fields.datetime.now(),
                 'type': type,
-                'subtype': subtype,
+                'content_subtype': content_subtype,
                 'state': state,
                 'message_id': message_id,
                 'attachment_ids': [(6, 0, to_attach)],
@@ -355,7 +355,7 @@ class mail_thread(osv.osv):
                             body_html= msg_dict.get('body_html'),
                             parent_id = msg_dict.get('parent_id', False),
                             type = msg_dict.get('type', 'email'),
-                            subtype = msg_dict.get('subtype', 'plain'),
+                            content_subtype = msg_dict.get('content_subtype', 'plain'),
                             state = msg_dict.get('state', 'received'),
                             email_from = msg_dict.get('from', msg_dict.get('email_from')),
                             email_to = msg_dict.get('to', msg_dict.get('email_to')),
@@ -686,12 +686,12 @@ class mail_thread(osv.osv):
     # Note specific
     #------------------------------------------------------
     
-    def message_broadcast(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', subtype='html', context=None):
+    def message_broadcast(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None):
         if context is None:
             context = {}
         notification_obj = self.pool.get('mail.notification')
         # write message
-        msg_ids = self.message_append_note(cr, uid, ids, subject=subject, body=body, parent_id=parent_id, type=type, subtype=subtype, context=context)
+        msg_ids = self.message_append_note(cr, uid, ids, subject=subject, body=body, parent_id=parent_id, type=type, content_subtype=content_subtype, context=context)
         # escape if in install mode or note writing was not successfull
         if 'install_mode' in context:
             return True
@@ -715,7 +715,7 @@ class mail_thread(osv.osv):
         _logger.warning("log() is deprecated. Please use OpenChatter notification system instead of the res.log mechanism.")
         self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
     
-    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', subtype='html', context=None):
+    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None):
         if subject is None:
             if type == 'notification':
                 subject = _('System notification')
@@ -723,13 +723,13 @@ class mail_thread(osv.osv):
                 subject = _('Comment')
             elif type == 'comment' and parent_id:
                 subject = _('Reply')
-        if subtype == 'html':
+        if content_subtype == 'html':
             body_html = body
             body_text = body
         else:
             body_html = body
             body_text = body
-        return self.message_append(cr, uid, ids, subject, body_html=body_html, body_text=body_text, parent_id=parent_id, type=type, subtype=subtype, context=context)
+        return self.message_append(cr, uid, ids, subject, body_html=body_html, body_text=body_text, parent_id=parent_id, type=type, content_subtype=content_subtype, context=context)
     
     #------------------------------------------------------
     # Subscription mechanism
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index dd07cbce9b2..fa039f25c07 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -158,7 +158,7 @@ class mail_compose_message(osv.osv_memory):
                 if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
                     subject = "%s %s" % (re_prefix, subject)
             result.update({
-                    'subtype' : 'plain', # default to the text version due to quoting
+                    'content_subtype' : 'plain', # default to the text version due to quoting
                     'body_text' : body,
                     'subject' : subject,
                     'attachment_ids' : [],
@@ -198,7 +198,7 @@ class mail_compose_message(osv.osv_memory):
             references = None
             headers = {}
 
-            body =  mail.body_html if mail.subtype == 'html' else mail.body_text
+            body =  mail.body_html if mail.content_subtype == 'html' else mail.body_text
 
             # Get model, and check whether it is OpenChatter enabled, aka inherit from mail.thread
             if context.get('mail.compose.message.mode') == 'mass_mail':
@@ -238,26 +238,26 @@ class mail_compose_message(osv.osv_memory):
                     # processed as soon as the mail scheduler runs.
                     if mail_thread_enabled:
                         active_model_pool.message_append(cr, uid, [active_id],
-                            subject, body_text=mail.body_text, body_html=mail.body_html, subtype=mail.subtype, state='outgoing',
+                            subject, body_text=mail.body_text, body_html=mail.body_html, content_subtype=mail.content_subtype, state='outgoing',
                             email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
                         mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
                             model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
                             attachments=attachment, references=references, res_id=active_id,
-                            subtype=mail.subtype, headers=headers, context=context)
+                            content_subtype=mail.content_subtype, headers=headers, context=context)
             else:
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
                     msg_ids = active_model_pool.message_append(cr, uid, active_ids,
-                            mail.subject, body_text=mail.body_text, body_html=mail.body_html, subtype=mail.subtype, state='outgoing',
+                            mail.subject, body_text=mail.body_text, body_html=mail.body_html, content_subtype=mail.content_subtype, state='outgoing',
                             email_to=mail.email_to, email_from=mail.email_from, email_cc=mail.email_cc, email_bcc=mail.email_bcc,
                             reply_to=mail.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
                     msg_ids = [mail_message.schedule_with_attach(cr, uid, mail.email_from, to_email(mail.email_to), mail.subject, body,
                         model=mail.model, email_cc=to_email(mail.email_cc), email_bcc=to_email(mail.email_bcc), reply_to=mail.reply_to,
                         attachments=attachment, references=references, res_id=int(mail.res_id),
-                        subtype=mail.subtype, headers=headers, context=context)]
+                        content_subtype=mail.content_subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
                 mail_message.send(cr, uid, msg_ids, context=context)
 

From 4e5b58ce27616896bbf1bc5ab7a28aee10c99068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 11:53:01 +0200
Subject: [PATCH 007/397] [DOC] Small mail doc update.

bzr revid: tde@openerp.com-20120420095301-v2k16q9nvmq2myqp
---
 addons/mail/doc/mail_message.rst | 24 +++++++++++++++++++++++-
 addons/mail/mail_message.py      | 30 ++++++++++++++++--------------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/addons/mail/doc/mail_message.rst b/addons/mail/doc/mail_message.rst
index e41a772cac8..791a7bbb549 100644
--- a/addons/mail/doc/mail_message.rst
+++ b/addons/mail/doc/mail_message.rst
@@ -3,7 +3,29 @@
 mail.message
 ============
 
-TODO
+Models
++++++++
+
+``mail.message.common`` is an abstract class for holding the main attributes of a 
+message object. It could be reused as parent model for any database model 
+or wizard screen that needs to hold a kind of message.
+
+All internal logic should be in a database-based model while this model 
+holds the basics of a message. For example, a wizard for writing emails 
+should inherit from this class and not from mail.message.
+
+
+.. versionchanged:: 7.0
+
+ - ``subtype`` is renamed to ``content_subtype``: usually 'html' or 'plain'.
+   This field is used to select plain-text or rich-text contents accordingly.
+ - ``subtype`` is moved to mail.message model. The purpose is to be able to 
+   distinguish message of the same type, such as notifications about creating
+   or cancelling a record. For example, it is used to add the possibility 
+   to hide notifications in the wall.
+
+Those changes aim at being able to distinguish the message content to the
+message itself.
 
 mail.group
 ++++++++++
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1595fbae077..89e9319f3e5 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -68,9 +68,9 @@ class mail_message_common(osv.TransientModel):
        message object. It could be reused as parent model for any
        database model or wizard screen that needs to hold a kind of
        message.
-       All internal logic should be in a database-based model. For example,
-       a wizard for writing emails should inherit from this class and not
-       from mail.message."""
+       All internal logic should be in a database-based model while this
+       model holds the basics of a message. For example, a wizard for writing
+       emails should inherit from this class and not from mail.message."""
 
     def get_body(self, cr, uid, ids, name, arg, context=None):
         if context is None:
@@ -84,10 +84,10 @@ class mail_message_common(osv.TransientModel):
         return result
     
     def search_body(self, cr, uid, obj, name, args, context=None):
-        """will receive:
-           - obj: mail.message object
-           - name: 'body'
-           - args: [('body', 'ilike', 'blah')]"""
+        # will receive:
+        #   - obj: mail.message object
+        #   - name: 'body'
+        #   - args: [('body', 'ilike', 'blah')]
         return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
     
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
@@ -136,15 +136,14 @@ class mail_message_common(osv.TransientModel):
     }
 
 class mail_message(osv.osv):
-    '''Model holding messages: system notification (replacing res.log
-       notifications), comments (for OpenSocial feature) and
+    """Model holding messages: system notification (replacing res.log
+       notifications), comments (for OpenChatter feature) and
        RFC2822 email messages. This model also provides facilities to
        parse, queue and send new email messages. Type of messages
        are differentiated using the 'type' column.
        
        The ``display_text`` field will have a slightly different
-       presentation for real emails and for log messages.
-       '''
+       presentation for real emails and for log messages."""
 
     _name = 'mail.message'
     _inherit = 'mail.message.common'
@@ -210,12 +209,15 @@ class mail_message(osv.osv):
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
-        'message_tmptype': fields.selection([
+        'subtype': fields.selection([
                         ('email', 'e-mail'),
                         ('comment', 'Comment'),
                         ('create', 'Create'),
                         ('cancel', 'Cancel'),
-                        ], 'Type', help="Message temptype, such as create or cancel. May be overriden by addons."),
+                        ], 'Type', help="Message subtype, such as 'create' or 'cancel'. The purpose \
+                                         is to be able to distinguish message of the same type.\
+                                         For example, it is used to add the possibility to hide \
+                                         notifications in the wall."),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related user', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -234,7 +236,7 @@ class mail_message(osv.osv):
         
     _defaults = {
         'type': 'email',
-        'message_tmptype': 'email',
+        'subtype': 'email',
         'state': 'received',
     }
     

From b87449840e26dd23c36bce83bab08a730086aa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 12:07:51 +0200
Subject: [PATCH 008/397] [DOC] Small update.

bzr revid: tde@openerp.com-20120420100751-55lnmbrygn1cln8v
---
 addons/mail/doc/mail_message.rst | 18 ------------------
 addons/mail/doc/mail_thread.rst  | 20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/mail/doc/mail_message.rst b/addons/mail/doc/mail_message.rst
index 791a7bbb549..56244e251bf 100644
--- a/addons/mail/doc/mail_message.rst
+++ b/addons/mail/doc/mail_message.rst
@@ -26,21 +26,3 @@ should inherit from this class and not from mail.message.
 
 Those changes aim at being able to distinguish the message content to the
 message itself.
-
-mail.group
-++++++++++
-
-A mail_group is a collection of users sharing messages in a discussion group. Group users are users that follow the mail group, using the subscription/follow mechanism of OpenSocial. A mail group has nothing in common wih res.users.group.
-Additional information on fields:
-
- - ``member_ids``: user member of the groups are calculated with ``message_get_subscribers`` method from mail.thread
- - ``member_count``: calculated with member_ids
- - ``is_subscriber``: calculated with member_ids
-
-res.users
-+++++++++
-
-OpenChatter updates the res.users class:
- - it adds a preference about sending emails when receiving a notification
- - make a new user follow itself automatically
- - create a welcome message when creating a new user, to make his arrival in OpenERP more friendly
diff --git a/addons/mail/doc/mail_thread.rst b/addons/mail/doc/mail_thread.rst
index f15f78156d3..41ea014b06c 100644
--- a/addons/mail/doc/mail_thread.rst
+++ b/addons/mail/doc/mail_thread.rst
@@ -3,7 +3,25 @@
 mail.thread and OpenChatter
 ===========================
 
-TODO
+API
++++
+
+Writing messages and notifications
+----------------------------------
+
+``message_append``
+
+Creates a new mail.message through message_create. The new message is attached 
+to the current mail.thread, containing all the details passed as parameters. 
+All attachments will be attached to the  thread record as well as to the 
+actual message.
+
+This method calls message_create that will handle management of subscription 
+and notifications, and effectively create the message.
+
+If ``email_from`` is not set or ``type`` not set as 'email', a note message 
+is created (comment or system notification), without the usual envelope 
+attributes (sender, recipients, etc.).
 
 mail.group
 ++++++++++

From cf00272efe100c65f084a3c43aff986048d89ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 12:38:50 +0200
Subject: [PATCH 009/397] [IMP] Propagated content_subtype / subtype change.
 Also updated comments in code and slighty cleaned it.

bzr revid: tde@openerp.com-20120420103850-au5t7kocmlf6i1tt
---
 addons/mail/mail_thread.py          | 70 ++++++++++++++++-------------
 addons/mail/res_users.py            | 10 ++---
 addons/mail/static/src/xml/mail.xml |  2 +-
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8ffff25fd9..393ec38f2cc 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -65,7 +65,7 @@ class mail_thread(osv.osv):
     def _get_message_ids(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for id in ids:
-            res[id] = self.message_load_ids(cr, uid, [id], context=context)
+            res[id] = self._message_load_ids(cr, uid, [id], context=context)
         return res
     
     # OpenChatter: message_ids_social is a dummy field that should not be used
@@ -218,19 +218,22 @@ class mail_thread(osv.osv):
         return ret_dict
 
     def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        parent_id=False, type='email', content_subtype='plain', state='received',
-                        email_to=False, email_from=False, email_cc=None, email_bcc=None,
-                        reply_to=None, email_date=None, message_id=False, references=None,
-                        attachments=None, headers=None, original=None, context=None):
-        """Creates a new mail.message attached to the current mail.thread,
-           containing all the details passed as parameters.  All attachments
-           will be attached to the thread record as well as to the actual
-           message.
+                        type='email', subtype=None, email_date=None, parent_id=False,
+                        content_subtype='plain', state=None, email_from=False, email_to=False,
+                        email_cc=None, email_bcc=None, reply_to=None,
+                        headers=None, message_id=False, references=None,
+                        attachments=None, original=None, context=None):
+        """Creates a new mail.message through message_create. The new message
+           is attached to the current mail.thread, containing all the details 
+           passed as parameters. All attachments will be attached to the 
+           thread record as well as to the actual message.
+           
+           This method calls message_create that will handle management of
+           subscription and notifications, and effectively create the message.
+           
            If ``email_from`` is not set or ``type`` not set as 'email',
-           a note message is created, without the usual envelope
-           attributes (sender, recipients, etc.).
-           The creation of the message is done by calling ``message_create``
-           method, that will manage automatic pushing of notifications.
+           a note message is created (comment or system notification), 
+           without the usual envelope attributes (sender, recipients, etc.).
 
         :param threads: list of thread ids, or list of browse_records representing
                         threads to which a new message should be attached
@@ -238,20 +241,21 @@ class mail_thread(osv.osv):
                         is an *event log* entry.
         :param body_text: plaintext contents of the mail or log message
         :param body_html: html contents of the mail or log message
-        :param parent_id: id of the parent message (threaded messaging model)
         :param type: optional type of message: 'email', 'comment', 'notification'
+        :param subtype: optional subtype of message, such as 'create' or 'cancel'
+        :param email_date: email date string if different from now, in server timezone
+        :param parent_id: id of the parent message (threaded messaging model)
         :param content_subtype: optional content_subtype of message: 'plain' or 'html', corresponding to the main
                         body contents (body_text or body_html).
         :param state: optional state of message; 'received' by default
-        :param email_to: Email-To / Recipient address
         :param email_from: Email From / Sender address if any
+        :param email_to: Email-To / Recipient address
         :param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
         :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
         :param reply_to: reply_to header
-        :param email_date: email date string if different from now, in server timezone
+        :param headers: mail headers to store
         :param message_id: optional email identifier
         :param references: optional email references
-        :param headers: mail headers to store
         :param dict attachments: map of attachment filenames to binary contents, if any.
         :param str original: optional full source of the RFC2822 email, for reference
         :param dict context: if a ``thread_model`` value is present
@@ -304,6 +308,7 @@ class mail_thread(osv.osv):
                 'parent_id': parent_id,
                 'date': email_date or fields.datetime.now(),
                 'type': type,
+                'subtype': subtype,
                 'content_subtype': content_subtype,
                 'state': state,
                 'message_id': message_id,
@@ -355,8 +360,9 @@ class mail_thread(osv.osv):
                             body_html= msg_dict.get('body_html'),
                             parent_id = msg_dict.get('parent_id', False),
                             type = msg_dict.get('type', 'email'),
-                            content_subtype = msg_dict.get('content_subtype', 'plain'),
-                            state = msg_dict.get('state', 'received'),
+                            subtype = msg_dict.get('subtype'),
+                            content_subtype = msg_dict.get('content_subtype'),
+                            state = msg_dict.get('state'),
                             email_from = msg_dict.get('from', msg_dict.get('email_from')),
                             email_to = msg_dict.get('to', msg_dict.get('email_to')),
                             email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
@@ -372,7 +378,7 @@ class mail_thread(osv.osv):
                             context = context)
 
     # Message loading
-    def _message_add_ancestor_ids(self, cr, uid, ids, child_ids, root_ids, context=None):
+    def _message_load_add_ancestor_ids(self, cr, uid, ids, child_ids, root_ids, context=None):
         """ Given message child_ids
             Find their ancestors until root ids"""
         if context is None:
@@ -391,7 +397,7 @@ class mail_thread(osv.osv):
             _logger.warning("Possible infinite loop in _message_add_ancestor_ids. Note that this algorithm is intended to check for cycle in message graph.")
         return child_ids
     
-    def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
+    def _message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
         """ OpenChatter feature: return thread messages ids. It searches in
             mail.messages where res_id = ids, (res_)model = current model.
             :param domain: domain to add to the search; especially child_of
@@ -401,18 +407,16 @@ class mail_thread(osv.osv):
             :param root_ids: for ascent search
             :param root_ids: root_ids when performing an ascended search
         """
-        if context is None:
-            context = {}
         msg_obj = self.pool.get('mail.message')
         msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', ids), ('model', '=', self._name)] + domain,
             limit=limit, offset=offset, context=context)
-        if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
         return msg_ids
         
     def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
         """ OpenChatter feature: return thread messages
         """
-        msg_ids = self.message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
+        msg_ids = self._message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
         return self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
     
     def get_pushed_messages(self, cr, uid, ids, limit=100, offset=0, msg_search_domain=[], ascent=False, root_ids=[], context=None):
@@ -424,7 +428,6 @@ class mail_thread(osv.osv):
             :param root_ids: for ascent search
             :return list of mail.messages sorted by date
         """
-        if context is None: context = {}
         notification_obj = self.pool.get('mail.notification')
         msg_obj = self.pool.get('mail.message')
         # update message search
@@ -439,7 +442,7 @@ class mail_thread(osv.osv):
         msg_ids = [notification.message_id.id for notification in notifications]
         # get messages
         msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
-        if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
         msgs = msg_obj.read(cr, uid, msg_ids, context=context)
         return msgs
         
@@ -712,10 +715,15 @@ class mail_thread(osv.osv):
         return True
     
     def log(self, cr, uid, id, message, secondary=False, context=None):
-        _logger.warning("log() is deprecated. Please use OpenChatter notification system instead of the res.log mechanism.")
+        _logger.warning("log() is deprecated. As this module inherit from \
+                        mail.thread, the message will be managed by this \
+                        module instead of by the res.log mechanism. Please \
+                        use the mail.thread OpenChatter API instead of the \
+                        now deprecated res.log.")
         self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
     
-    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None):
+    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
+                            type='notification', content_subtype='html', subtype=None, context=None):
         if subject is None:
             if type == 'notification':
                 subject = _('System notification')
@@ -729,7 +737,9 @@ class mail_thread(osv.osv):
         else:
             body_html = body
             body_text = body
-        return self.message_append(cr, uid, ids, subject, body_html=body_html, body_text=body_text, parent_id=parent_id, type=type, content_subtype=content_subtype, context=context)
+        return self.message_append(cr, uid, ids, subject, body_html, body_text,
+                                    type, subtype, parent_id=parent_id,
+                                    content_subtype=content_subtype, context=context)
     
     #------------------------------------------------------
     # Subscription mechanism
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 05bc4213e85..0f4fc080ee2 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -67,18 +67,16 @@ class res_users(osv.osv):
         #self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context)
         return user_id
 
-    def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
-        """ Override of message_load_ids
+    def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
+        """ Override of message_load
             User discussion page :
             - messages posted on res.users, res_id = user.id
             - messages directly sent to user with @user_login
         """
-        if context is None:
-            context = {}
         msg_obj = self.pool.get('mail.message')
         msg_ids = []
         for user in self.browse(cr, uid, ids, context=context):
             msg_ids += msg_obj.search(cr, uid, ['|', '|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login)), '&', ('res_id', '=', user.id), ('model', '=', self._name)] + domain,
             limit=limit, offset=offset, context=context)
-        if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
-        return msg_ids
+        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+        return msg_obj.read(cr, uid, msg_ids, context=context)
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7fe1d39a661..de21d510202 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -61,7 +61,7 @@
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
                 <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.message_subtype"/>
+                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.subtype"/>
                 </a></li>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>

From f540a782b4a07acc496073b224a4a64dc696f242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 12:39:08 +0200
Subject: [PATCH 010/397] [IMP] crm: test of subtype in message_append_note,
 for example.

bzr revid: tde@openerp.com-20120420103908-dtvu2ofcvflk6e7a
---
 addons/crm/crm_lead.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00f477a75d7..f0f867525e7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -845,16 +845,16 @@ class crm_lead(crm_case, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=message, context=context)
+            self.message_append_note(cr, uid, [id], body=message, subtype='create', context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype='lost', context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_append_note(cr, uid, ids, body=message, subtype='won', context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]

From c4e6874e234e0db39f69ffab94927d1d1b9d69e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 14:09:48 +0200
Subject: [PATCH 011/397] [IMP] mail.thread: added the hiding method. However,
 this won t work with automatic subscriptions. Will need to be managed.
 Updating mail.js to be able to hide subtypes.

bzr revid: tde@openerp.com-20120420120948-er9xsc575fjf04mc
---
 addons/mail/mail_thread.py          | 16 ++++++++++++++++
 addons/mail/static/src/js/mail.js   | 10 +++++-----
 addons/mail/static/src/xml/mail.xml |  4 ++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 393ec38f2cc..2d09e440af1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -783,6 +783,22 @@ class mail_thread(osv.osv):
         subscription_obj.unlink(cr, uid, to_delete_sub_ids, context=context)
         return True
 
+    def message_subscription_hide(self, cr, uid, ids, subtype=None, context=None):
+        """Hide notifications, allowing to tune the messages displayed on
+           the Wall.
+           :param subtype: a mail.message subtype. If None, it is means the
+                           user wants to hide all notifications coming from
+                           the document.
+        """
+        subscription_obj = self.pool.get('mail.subscription')
+        subscription_hide_obj = self.pool.get('mail.subscription.hide')
+        # find the related subscriptions
+        subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids), ('user_id', '=', uid)], context=context)
+        # hide it
+        for subscription_id in subscription_ids:
+            subscription_hide_obj.create(cr, uid, {'subscription_id': subscription_id, 'subtype': subtype}, context=context)
+        return True
+    
     #------------------------------------------------------
     # Notification API
     #------------------------------------------------------
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 160a1dc33fd..835b1bcb828 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -190,12 +190,12 @@ openerp.mail = function(session) {
             });
             // event: click on 'hide this type' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
-                console.log('hiding type');
+                //console.log('hiding type');
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                console.log(msg_id);
-                //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
+                var subtype = event.srcElement.dataset.subtype;
+                if (! subtype) return false;
+                //console.log(subtype);
+                var call_defer = self.ds.call('message_subscription_hide', [[self.params.res_id], subtype]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index de21d510202..76d60341254 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -60,8 +60,8 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.subtype"/>
+                <li><a href="#" class="oe_mail_msg_hide_thread" t-attf-data-id='{record.id}'>Hide this thread</a></li>
+                <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/>
                 </a></li>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>

From afc63c5a3e85305d3f4e9047d76feb4cf6a5c128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 14:42:00 +0200
Subject: [PATCH 012/397] [REF] subscribers inheritance: now override
 message_get_subscribers_ids, so the read is done in another method, or allow
 to reuse the user_ids in other methods. It allows to cleany separate having
 the ids from reading them.

bzr revid: tde@openerp.com-20120420124200-3ictqpdjw1jtdkeo
---
 addons/crm/crm_lead.py                  |  6 +++---
 addons/hr_holidays/hr_holidays.py       |  6 +++---
 addons/hr_recruitment/hr_recruitment.py |  6 +++---
 addons/mail/mail_thread.py              |  8 ++++++--
 addons/mrp/mrp.py                       |  6 +++---
 addons/project/project.py               | 12 ++++++------
 addons/project_issue/project_issue.py   |  6 +++---
 7 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f0f867525e7..99bda3ec740 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -829,13 +829,13 @@ class crm_lead(crm_case, osv.osv):
     # OpenChatter methods and notifications
     # ----------------------------------------
 
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context)
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(crm_lead, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         # add salesman to the subscribers
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
     
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e0bab685a4b..61ad93fe5ee 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -372,13 +372,13 @@ class hr_holidays(osv.osv):
                     result[obj.id] = hr_manager_group['users']
         return result
     
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(hr_holidays, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         # add the employee and its manager if specified to the subscribed users
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.employee_id.parent_id:
                 sub_ids.append(obj.employee_id.parent_id.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 17a2d11fd0e..1ad2d92e564 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -484,12 +484,12 @@ class hr_applicant(crm.crm_case, osv.osv):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
     
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(hr_applicant, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
 
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
         result = dict.fromkeys(ids, [])
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2d09e440af1..34415a28ae1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -108,7 +108,7 @@ class mail_thread(osv.osv):
         # delete subscriptions
         subscr_to_del_ids = subscr_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
         subscr_obj.unlink(cr, uid, subscr_to_del_ids, context=context)
-        # delete notifications
+        # delete messages and notifications
         msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
         msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
         
@@ -119,7 +119,7 @@ class mail_thread(osv.osv):
     #------------------------------------------------------
     
     def message_create(self, cr, uid, thread_id, vals, context=None):
-        """OpenSocial: wrapper of mail.message create method
+        """OpenChatter: wrapper of mail.message create method
            - creates the mail.message
            - automatically subscribe the message writer
            - push the message to subscribed users
@@ -182,6 +182,10 @@ class mail_thread(osv.osv):
         for thread_id in thread_ids:
             # add subscribers
             notif_user_ids += [user['id'] for user in self.message_get_subscribers(cr, uid, [thread_id], context=context)]
+            
+            # get hiden subscriptions
+            #subscription_hide_obj.search(cr, uid, [('subscription_id', 'in', ids), ('subtype', '=', new_msg_vals.get('subtype'))], context=context)
+            
             # add users requested via parsing message (@login)
             notif_user_ids += self.message_parse_users(cr, uid, [thread_id], body, context=context)
             # add users requested to perform an action (need_action mechanism)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..f5192aa8428 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1041,12 +1041,12 @@ class mrp_production(osv.osv):
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(mrp_production, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
 
     def create_send_note(self, cr, uid, ids, context=None):
         self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
diff --git a/addons/project/project.py b/addons/project/project.py
index 0335b7cb540..5f65451ba9f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -455,12 +455,12 @@ def Project():
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(project_project, self).message_get_subscribers_ids(cr, uid, ids, context=context);
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project, self).create(cr, uid, vals, context=context)
@@ -1138,14 +1138,14 @@ class task(osv.osv):
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(project_task, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
             if obj.manager_id:
                 sub_ids.append(obj.manager_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
 
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e61af235d42..1ad944cea28 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -474,12 +474,12 @@ class project_issue(crm.crm_case, osv.osv):
                 result[obj.id] = [obj.user_id.id]
         return result
     
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+        sub_ids = super(project_issue, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+        return sub_ids
     
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         return 'Project issue '

From 9ebcec17cb8911b3a132fe854739b5fb3cab4512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 15:19:44 +0200
Subject: [PATCH 013/397] [IMP] mail.thread: added support of hidden
 subscriptions when pushing notifications to users.

bzr revid: tde@openerp.com-20120420131944-42bsm88x7q84l62i
---
 addons/mail/mail_thread.py | 54 ++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 34415a28ae1..c1bd9365527 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -174,29 +174,39 @@ class mail_thread(osv.osv):
         return msg_id
     
     def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        if context is None:
-            context = {}
-        
-        notif_user_ids = []
+        subscription_obj = self.pool.get('mail.subscription')
+        hide_obj = self.pool.get('mail.subscription.hide')
+        # get body
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
-        for thread_id in thread_ids:
-            # add subscribers
-            notif_user_ids += [user['id'] for user in self.message_get_subscribers(cr, uid, [thread_id], context=context)]
-            
-            # get hiden subscriptions
-            #subscription_hide_obj.search(cr, uid, [('subscription_id', 'in', ids), ('subtype', '=', new_msg_vals.get('subtype'))], context=context)
-            
-            # add users requested via parsing message (@login)
-            notif_user_ids += self.message_parse_users(cr, uid, [thread_id], body, context=context)
-            # add users requested to perform an action (need_action mechanism)
-            if hasattr(self, 'get_needaction_user_ids'):
-                notif_user_ids += self.get_needaction_user_ids(cr, uid, [thread_id], context=context)[thread_id]
-            # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
-            if new_msg_vals.get('parent_id'):
-                notif_obj = self.pool.get('mail.notification')
-                parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
-                parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
-                notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
+        
+        # get subscribers
+        user_sub_ids = self.message_get_subscribers_ids(cr, uid, thread_ids, context=context)
+        
+        # get hiden subscriptions
+        subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', thread_ids), ('user_id', 'in', user_sub_ids)], context=context)
+        hide_ids = hide_obj.search(cr, uid, [('subscription_id', 'in', subscription_ids), ('subtype', '=', new_msg_vals.get('subtype'))], context=context)
+        if hide_ids:
+            hiden_subscription_ids = map(itemgetter('subscription_id'), hide_obj.read(cr, uid, hide_ids, ['subscription_id'], context=context))
+            hiden_user_ids = map(itemgetter('user_id'), subscription_obj.read(cr, uid, hiden_subscription_ids, ['user_id'], context=context))
+            notif_user_ids = [user_id for user_id in user_sub_ids if not user_id in hiden_user_ids]
+        else:
+            notif_user_ids = user_sub_ids
+        
+        # add users requested via parsing message (@login)
+        notif_user_ids += self.message_parse_users(cr, uid, thread_ids, body, context=context)
+        
+        # add users requested to perform an action (need_action mechanism)
+        if hasattr(self, 'get_needaction_user_ids'):
+            user_ids_dict = self.get_needaction_user_ids(cr, uid, thread_ids, context=context)
+            for id, user_ids in user_ids_dict.iteritems():
+                notif_user_ids += user_ids
+        
+        # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
+        if new_msg_vals.get('parent_id'):
+            notif_obj = self.pool.get('mail.notification')
+            parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
+            parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
+            notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
         
         # remove duplicate entries
         notif_user_ids = list(set(notif_user_ids))

From 66b67b79b4d99711c4436ac9defeeb39c894021a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 15:20:49 +0200
Subject: [PATCH 014/397] [IMP] mail.message: subtype field is now a char, not
 a selection anymore.

bzr revid: tde@openerp.com-20120420132049-t10va307h52r3u22
---
 addons/mail/mail_message.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 89e9319f3e5..a276388444e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -209,15 +209,11 @@ class mail_message(osv.osv):
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
-        'subtype': fields.selection([
-                        ('email', 'e-mail'),
-                        ('comment', 'Comment'),
-                        ('create', 'Create'),
-                        ('cancel', 'Cancel'),
-                        ], 'Type', help="Message subtype, such as 'create' or 'cancel'. The purpose \
-                                         is to be able to distinguish message of the same type.\
-                                         For example, it is used to add the possibility to hide \
-                                         notifications in the wall."),
+        'subtype': fields.char('Subtype', size=64,
+                        help="Message subtype, such as 'create' or 'cancel'. The purpose \
+                        is to be able to distinguish message of the same type.\
+                        For example, it is used to add the possibility to hide \
+                        notifications in the wall."),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related user', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),

From e6e51cdda6ac988c3be2c0f3319c8776e60790ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 16:08:57 +0200
Subject: [PATCH 015/397] [FIX] project: fixed wrong class names in super.

bzr revid: tde@openerp.com-20120420140857-lrpx4iapqw84juvy
---
 addons/project/project.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 5f65451ba9f..1d74568bd67 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -456,7 +456,7 @@ def Project():
         return result
 
     def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(project_project, self).message_get_subscribers_ids(cr, uid, ids, context=context);
+        sub_ids = super(project, self).message_get_subscribers_ids(cr, uid, ids, context=context);
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)
@@ -1139,7 +1139,7 @@ class task(osv.osv):
         return result
 
     def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(project_task, self).message_get_subscribers_ids(cr, uid, ids, context=context)
+        sub_ids = super(task, self).message_get_subscribers_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id:
                 sub_ids.append(obj.user_id.id)

From c4addb4d5ac05ae39e64a8cad460a22d159e9859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 17:58:27 +0200
Subject: [PATCH 016/397] [ADD] Thread widget: added a 'reply by email' link.
 Open the mail.compose.message wizard. WIP: must add default values, such as
 email_to, ... Will be done asap.

bzr revid: tde@openerp.com-20120420155827-8of3e0i70getenpl
---
 addons/mail/static/src/js/mail.js                | 16 ++++++++++++++++
 addons/mail/static/src/xml/mail.xml              |  1 +
 addons/mail/wizard/mail_compose_message.py       |  1 +
 addons/mail/wizard/mail_compose_message_view.xml | 16 +++++++++++++++-
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 835b1bcb828..5eed795186e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -225,6 +225,22 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) {
                 self.$element.find('ul.oe_mail_msg_menu').toggle();
             });
+            // event: click on "send an email"
+            this.$element.find('div.oe_mail_thread_act').delegate('a.oe_mail_compose', 'click', function (event) {
+                console.log('cacaprout');
+                self.do_action({
+                        type: 'ir.actions.act_window',
+                        res_model: 'mail.compose.message',
+                        views: [[false, 'form']],
+                        view_type: 'form',
+                        view_mode: 'form',
+                        target: 'new',
+                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'mail.compose.message.mode': 'new'},
+                        key2: 'client_action_multi',
+                });
+                return false;
+            });
+            
         },
         
         destroy: function () {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 76d60341254..05adf4b5141 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,6 +45,7 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
+            <a href="#" class="oe_mail_compose">Repley by e-mail</a><br />
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fa039f25c07..110d8dd09a0 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -67,6 +67,7 @@ class mail_compose_message(osv.osv_memory):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         """
+        print context
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d559d679c8b..ae62c2102c5 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,17 +8,31 @@
             <field name="arch" type="xml">
                 <form string="Compose Email">
                     <group col="6" colspan="4">
+<!--
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
+-->
+			<field name='filter_id'/>
+<!--
                         <field name='filter_id' invisible="context.get('active_model',False)"/>
-                        <field name="email_from" colspan="4" required="1"/>
+-->
+                        <newline/>
+			<field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
                         <field name="email_cc" colspan="4"/>
                         <field name="email_bcc" colspan="4"/>
                         <field name="reply_to" colspan="4"/>
                         <field name="subject" colspan="4" widget="char" size="512"/>
+			<separator string="Debug information" colspan="6"/>
+			<field name="model"/>
+                        <field name="res_id"/>
+			<newline/>
+                        <field name="references"/>
+                        <field name="message_id"/>
+<!--
                         <field name="references" invisible="1"/>
                         <field name="message_id" invisible="1"/>
+-->
                     </group>
                     <notebook colspan="4">
                         <page string="Body">

From 2fe3e0508df20f39d740b8f83aeb87e8f816f84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 10:09:25 +0200
Subject: [PATCH 017/397] [IMP] mail.group: added overrider of message_load
 method, allowing to get messages of followed models in Chatter widget.

bzr revid: tde@openerp.com-20120503080925-bj3777jkdn5gebvp
---
 addons/mail/mail_group.py | 64 ++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 83d0705c4e0..48bc6d4723c 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -49,12 +49,6 @@ class mail_group(osv.osv):
     _name = 'mail.group'
     _inherit = ['mail.thread']
 
-    def action_group_join(self, cr, uid, ids, context={}):
-        return self.message_subscribe(cr, uid, ids, context=context);
-    
-    def action_group_leave(self, cr, uid, ids, context={}):
-        return self.message_unsubscribe(cr, uid, ids, context=context);
-
     def onchange_photo(self, cr, uid, ids, value, context=None):
         if not value:
             return {'value': {'avatar_big': value, 'avatar': value} }
@@ -118,19 +112,28 @@ class mail_group(osv.osv):
         'responsible_id': fields.many2one('res.users', string='Responsible',
                             ondelete='set null', required=True, select=1,
                             help="Responsible of the group that has all rights on the record."),
-        'public': fields.boolean('Public', help='This group is visible by non members. Invisible groups can add members through the invite button.'),
-        'models': fields.many2many('ir.model', rel='mail_group_models_rel', id1='mail_group_id', id2='model_id',
+        'public': fields.boolean('Public', help='This group is visible by non members. \
+                            Invisible groups can add members through the invite button.'),
+        'models': fields.many2many('ir.model', rel='mail_group_models_rel',
+                            id1='mail_group_id', id2='model_id',
                             string='Linked models', help='Linked models'),
-        'photo_big': fields.binary('Full-size photo', help='Field holding the full-sized PIL-supported and base64 encoded version of the group image. The photo field is used as an interface for this field.'),
+        'photo_big': fields.binary('Full-size photo', help='Field holding \
+                            the full-sized PIL-supported and base64 encoded \
+                            version of the group image. The photo field is \
+                            used as an interface for this field.'),
         'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Photo', type="binary",
             store = {
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10),
             }, help='Field holding the automatically resized (128x128) PIL-supported and base64 encoded version of the group image.'),
-        'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids, type='many2many',
-                        relation='res.users', string='Group members', multi='get_member_ids'),
-        'member_count': fields.function(get_member_ids, type='integer', string='Member count', multi='get_member_ids'),
-        'is_subscriber': fields.function(get_member_ids, type='boolean', string='Joined', multi='get_member_ids'),
-        'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer', string='Messages count for last month'),
+        'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids,
+                            type='many2many', relation='res.users',
+                            string='Group members', multi='get_member_ids'),
+        'member_count': fields.function(get_member_ids, type='integer',
+                            string='Member count', multi='get_member_ids'),
+        'is_subscriber': fields.function(get_member_ids, type='boolean',
+                            string='Joined', multi='get_member_ids'),
+        'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer',
+                            string='Messages count for last month'),
     }
 
     _defaults = {
@@ -138,3 +141,36 @@ class mail_group(osv.osv):
         'responsible_id': (lambda s, cr, uid, ctx: uid),
         'photo': _get_default_photo,
     }
+    
+    def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
+        """ Override OpenChatter method.
+            if models attribute is set: search all messages from that model
+            else: as usual
+            :param domain: domain to add to the search; especially child_of
+                           is interesting when dealing with threaded display
+            :param ascent: performs an ascended search; will add to fetched msgs
+                           all their parents until root_ids
+            :param root_ids: for ascent search
+            :param root_ids: root_ids when performing an ascended search
+        """
+        search_domain = []
+        for group in self.browse(cr, uid, ids, context=context):
+            # call super to have default message ids
+            message_obj = self.pool.get('mail.message')
+            group_msgs = super(mail_group, self).message_load(cr, uid, ids, limit, offset, domain, ascent, root_ids, context)
+            msg_ids = map(itemgetter('id'), group_msgs)
+            search_domain = ['|', '&', ('model', '=', self._name), ('id', 'in', ids)]
+            # add message ids linked to group models
+            model_list = []
+            for model in group.models:
+                model_list.append(model.model)
+            search_domain.append(('model', 'in', model_list))
+            msg_ids += message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
+        return message_obj.read(cr, uid, msg_ids, context=context)
+    
+    def action_group_join(self, cr, uid, ids, context=None):
+        return self.message_subscribe(cr, uid, ids, context=context)
+    
+    def action_group_leave(self, cr, uid, ids, context=None):
+        return self.message_unsubscribe(cr, uid, ids, context=context)
+    

From 37cae78b4f98c653712b6a829a985f5cc262c415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 11:37:25 +0200
Subject: [PATCH 018/397] [REF] mail.thread: cleaned message_load function
 prototype and behaviour. Added possibility to directly ask for a count or
 get_id instead of always a read result.

bzr revid: tde@openerp.com-20120503093725-iy08hh5c4ram3pz5
---
 addons/mail/mail_thread.py | 99 +++++++++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 27 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c1bd9365527..693c26842c7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -392,49 +392,94 @@ class mail_thread(osv.osv):
                             context = context)
 
     # Message loading
-    def _message_load_add_ancestor_ids(self, cr, uid, ids, child_ids, root_ids, context=None):
-        """ Given message child_ids
-            Find their ancestors until root ids"""
-        if context is None:
-            context = {}
+    def _message_load_add_ancestor_ids(self, cr, uid, ids, child_ids, ancestor_ids, context=None):
+        """ Given message child_ids ids, find their ancestors until ancestor_ids
+            using their parent_id relationship."""
         msg_obj = self.pool.get('mail.message')
         tmp_msgs = msg_obj.read(cr, uid, child_ids, ['id', 'parent_id'], context=context)
-        parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in root_ids and msg['parent_id'][0] not in child_ids]
+        parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in ancestor_ids and msg['parent_id'][0] not in child_ids]
         child_ids += parent_ids
         cur_iter = 0; max_iter = 100; # avoid infinite loop
         while (parent_ids and (cur_iter < max_iter)):
             cur_iter += 1
             tmp_msgs = msg_obj.read(cr, uid, parent_ids, ['id', 'parent_id'], context=context)
-            parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in root_ids and msg['parent_id'][0] not in child_ids]
+            parent_ids = [msg['parent_id'][0] for msg in tmp_msgs if msg['parent_id'] and msg['parent_id'][0] not in ancestor_ids and msg['parent_id'][0] not in child_ids]
             child_ids += parent_ids
         if (cur_iter > max_iter):
-            _logger.warning("Possible infinite loop in _message_add_ancestor_ids. Note that this algorithm is intended to check for cycle in message graph.")
+            _logger.warning("Possible infinite loop in _message_add_ancestor_ids. \
+                            Note that this algorithm is intended to check for cycle \
+                            in message graph, leading to a curious error. Have fun.")
         return child_ids
     
-    def _message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
-        """ OpenChatter feature: return thread messages ids. It searches in
-            mail.messages where res_id = ids, (res_)model = current model.
+    def _message_load_ids(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+                            limit=100, offset=0, domain=None, count=False, context=None):
+        """ OpenChatter feature: returns thread messages ids. It searches in
+            mail.messages where ``res_id = ids, (res_)model = current model``.
+            
+            It is possible to add in the search the parent of messages by
+            setting the fetch_ancestors flag to True. In that case, using
+            the parent_id relationship, the method returns the id list according
+            to the search domain, but then calls ``_message_load_add_ancestor_ids``
+            that will add to the list the ancestors ids. The search is limited
+            to parent messages having an id in ancestor_ids or having
+            parent_id set to False.
+            
+            If ``count==True``, the number of ids is returned instead of the
+            id list. The count is done by hand instead of passing it as an 
+            argument to the search call because we might want to perform
+            a research including parent messages until some ancestor_ids.
+            
+            :param fetch_ancestors: performs an ascended search; will add 
+                                    to fetched msgs all their parents until
+                                    ancestor_ids
+            :param ancestor_ids: used when fetching ancestors
             :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display
-            :param ascent: performs an ascended search; will add to fetched msgs
-                           all their parents until root_ids
-            :param root_ids: for ascent search
-            :param root_ids: root_ids when performing an ascended search
+                           is interesting when dealing with threaded display.
+                           Note that the added domain is anded with the 
+                           default domain.
+            :param limit, offset, count, context: as usual
         """
         msg_obj = self.pool.get('mail.message')
-        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', ids), ('model', '=', self._name)] + domain,
-            limit=limit, offset=offset, context=context)
-        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
-        return msg_ids
+        search_domain = ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
+        if domain:
+            search_domain += domain
+        msg_ids = msg_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
+        if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
+        if count:
+            return len(msg_ids)
+        else:
+            return msg_ids
         
-    def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
-        """ OpenChatter feature: return thread messages
+    def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+                        limit=100, offset=0, domain=None, count=False,
+                        get_ids=False, context=None):
+        """ OpenChatter feature: return thread messages. This method calls
+            ``_message_load_ids`` to separate the search from the read.
+            
+            :param fetch_ancestors: performs an ascended search; will add
+                                    to fetched msgs all their parents until
+                                    ancestor_ids
+            :param ancestor_ids: used when fetching ancestors
+            :param domain: domain to add to the search; especially child_of
+                           is interesting when dealing with threaded display
+            :param root_ids: root_ids when performing an ascended search
+            :param limit, offset, count, context: as usual
+            :param get_ids: return ids instead of a read
         """
-        msg_ids = self._message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
-        return self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
+        load_res = self._message_load_ids(cr, uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, count, context=context)
+        if count or get_ids:
+            return load_res
+        else:
+            return self.pool.get('mail.message').read(cr, uid, load_res, context=context)
     
-    def get_pushed_messages(self, cr, uid, ids, limit=100, offset=0, msg_search_domain=[], ascent=False, root_ids=[], context=None):
-        """ OpenChatter: wall: get messages to display (=pushed notifications)
+    def get_pushed_messages(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
+                            limit=100, offset=0, msg_search_domain=[], context=None):
+        """ OpenChatter: wall: get messages to display (=pushed notifications).
+            
+            :param fetch_ancestors: performs an ascended search; will add
+                                    to fetched msgs all their parents until
+                                    ancestor_ids
+            :param ancestor_ids: used when fetching ancestors
             :param domain: domain to add to the search; especially child_of
                            is interesting when dealing with threaded display
             :param ascent: performs an ascended search; will add to fetched msgs
@@ -456,7 +501,7 @@ class mail_thread(osv.osv):
         msg_ids = [notification.message_id.id for notification in notifications]
         # get messages
         msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
-        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+        if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
         msgs = msg_obj.read(cr, uid, msg_ids, context=context)
         return msgs
         

From 647ceac3eed79db9f672107740ee84ef9903e985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 11:38:18 +0200
Subject: [PATCH 019/397] [FIX] Fixed message count that was incorrect; now
 uses message_load with count attribute on the right id.

bzr revid: tde@openerp.com-20120503093818-uwv5b8qitwr72bt0
---
 addons/mail/mail_group.py | 45 ++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 48bc6d4723c..49e23ceabf0 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -99,7 +99,7 @@ class mail_group(osv.osv):
         message_obj = self.pool.get('mail.message')
         for id in ids:
             lower_date = (DT.datetime.now() - DT.timedelta(days=30)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-            result[id] = message_obj.search(cr, uid, ['&', '&', ('model', '=', self._name), ('res_id', 'in', ids), ('date', '>=', lower_date)], count=True, context=context)
+            result[id] = self.message_load(cr, uid, [id], limit=None, domain=[('date', '>=', lower_date)], count=True, context=context)
         return result
     
     def _get_default_photo(self, cr, uid, context=None):
@@ -142,31 +142,36 @@ class mail_group(osv.osv):
         'photo': _get_default_photo,
     }
     
-    def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None):
-        """ Override OpenChatter method.
+    def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+                        limit=100, offset=0, domain=None, count=False, context=None):
+        """ Override OpenChatter message_load method.
             if models attribute is set: search all messages from that model
             else: as usual
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display
-            :param ascent: performs an ascended search; will add to fetched msgs
-                           all their parents until root_ids
-            :param root_ids: for ascent search
-            :param root_ids: root_ids when performing an ascended search
         """
-        search_domain = []
+        all_msg_ids = []
+        message_obj = self.pool.get('mail.message')
         for group in self.browse(cr, uid, ids, context=context):
             # call super to have default message ids
-            message_obj = self.pool.get('mail.message')
-            group_msgs = super(mail_group, self).message_load(cr, uid, ids, limit, offset, domain, ascent, root_ids, context)
-            msg_ids = map(itemgetter('id'), group_msgs)
-            search_domain = ['|', '&', ('model', '=', self._name), ('id', 'in', ids)]
+            group_msg_ids = super(mail_group, self).message_load(cr, uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, False, True, context)
+            group_domain = ['&', ('model', '=', self._name), ('id', 'in', group_msg_ids)]
+            # if no linked domain: go on
+            if not group.models:
+                search_domain = group_domain
             # add message ids linked to group models
-            model_list = []
-            for model in group.models:
-                model_list.append(model.model)
-            search_domain.append(('model', 'in', model_list))
-            msg_ids += message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
-        return message_obj.read(cr, uid, msg_ids, context=context)
+            else:
+                model_list = []
+                for model in group.models:
+                    model_list.append(model.model)
+                search_domain = [('|')] + group_domain
+                search_domain += [('model', 'in', model_list)]
+            # perform the search
+            msg_ids = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
+            if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
+            all_msg_ids += msg_ids
+        if count:
+            return len(all_msg_ids)
+        else:
+            return message_obj.read(cr, uid, all_msg_ids, context=context)
     
     def action_group_join(self, cr, uid, ids, context=None):
         return self.message_subscribe(cr, uid, ids, context=context)

From 5479127fbab301ae3ba7cc658bc92b2f5d933665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 11:38:43 +0200
Subject: [PATCH 020/397] [IMP] Thread widget: propagated change in mail.thread
 API.

bzr revid: tde@openerp.com-20120503093843-06bbrg90q1tjusrm
---
 addons/mail/static/src/js/mail.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5eed795186e..d9fae0fcefe 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -259,7 +259,8 @@ openerp.mail = function(session) {
         
         fetch_comments: function (limit, offset, domain) {
             var self = this;
-            var defer = this.ds.call('message_load', [[this.params.res_id], ( (limit+1)||(this.params.limit+1) ), (offset||this.params.offset), (domain||[]), (this.params.thread_level > 0), (this.sorted_comments['root_ids'])]);
+            var defer = this.ds.call('message_load', [[this.params.res_id], (this.params.thread_level > 0), (this.sorted_comments['root_ids']),
+                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]);
             $.when(defer).then(function (records) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
@@ -752,7 +753,7 @@ openerp.mail = function(session) {
             if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
             else var fetch_context = this.search['context'];
             return this.ds_thread.call('get_pushed_messages', 
-                [[this.session.uid], (limit || 0), (offset || 0), fetch_domain, true, [], fetch_context]).then(this.proxy('display_comments'));
+                [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
         },
 
         /**

From 64d1f25f6035163befc99276455e512b881e0655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 14:57:22 +0200
Subject: [PATCH 021/397] [IMP] mail.group: added a groups field to model,
 linking mail.group to res.groups. Uding the push_to_group flag, it allows to
 push message to certain groups. Updated view with a temp ugly form view.

bzr revid: tde@openerp.com-20120503125722-veegdrmmnowuwdtd
---
 addons/mail/mail_group.py       | 25 ++++++++++++++++++++++++-
 addons/mail/mail_group_view.xml | 20 +++++++++++++++-----
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 49e23ceabf0..0cfc590a996 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -114,9 +114,16 @@ class mail_group(osv.osv):
                             help="Responsible of the group that has all rights on the record."),
         'public': fields.boolean('Public', help='This group is visible by non members. \
                             Invisible groups can add members through the invite button.'),
-        'models': fields.many2many('ir.model', rel='mail_group_models_rel',
+        'models': fields.many2many('ir.model', rel='mail_group_ir_model_rel',
                             id1='mail_group_id', id2='model_id',
                             string='Linked models', help='Linked models'),
+        'groups': fields.many2many('res.groups', rel='mail_group_res_group_rel',
+                            id1='mail_group_id', id2='groups_id',
+                            string='Linked groups', help='Linked groups'),
+        'push_to_groups': fields.boolean('Push to groups', 
+                            help="When posting a comment on this mail_group, \
+                            the message is pushed to the users beloging to \
+                            the linked user groups."),
         'photo_big': fields.binary('Full-size photo', help='Field holding \
                             the full-sized PIL-supported and base64 encoded \
                             version of the group image. The photo field is \
@@ -142,6 +149,22 @@ class mail_group(osv.osv):
         'photo': _get_default_photo,
     }
     
+    def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None):
+        """ Overrider OpenChatter message_create_get_notification_user_ids
+            method. The purpose is to add to the subscribers users that 
+            belong to the res.groups linked to the mail.group through the 
+            groups field. The fields push_to_groups allows to control this 
+            feature.
+        """
+        notif_user_ids = super(mail_group, self).message_create_get_notification_user_ids(cr, uid, thread_ids, new_msg_vals, context=context)
+        for thread in self.browse(cr, uid, thread_ids, context=context):
+            if not thread.push_to_groups or not thread.groups:
+                continue
+            for group in thread.groups:
+                for user in group.users:
+                    notif_user_ids.append(user.id)
+        return list(set(notif_user_ids))
+        
     def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
                         limit=100, offset=0, domain=None, count=False, context=None):
         """ Override OpenChatter message_load method.
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d911b4a7deb..e15a5aa473d 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -58,11 +58,6 @@
                             <field name="responsible_id" colspan="2"/>
                             <newline/>
                             <field name="description" colspan="4"/>
-                            <field name="models" colspan="4">
-                                <tree string="Document models">
-                                    <field name="name"/>
-                                </tree>
-                            </field>
                         </group>
                         <group colspan="1" col="2">
                             <separator string="Group image" colspan="2"/>
@@ -74,6 +69,21 @@
                             <label string="This group is visible by non members" colspan="2"/>
                         </group>
                     </group>
+                    <notebook colspan="4">
+                        <page string="Links">
+                            <field name="models" colspan="4">
+                                <tree string="Document models">
+                                    <field name="name"/>
+                                </tree>
+                            </field>
+                            <field name="groups" colspan="4">
+                                <tree string="Document groups">
+                                    <field name="name"/>
+                                </tree>
+                            </field>
+                            <field name="push_to_groups"/>
+                        </page>
+                    </notebook>
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </form>
             </field>

From e267063735f839ab48b7c2a1e5a2ce9654621f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 14:57:46 +0200
Subject: [PATCH 022/397] [REF] mail module: moved some data to a new data
 folder.

bzr revid: tde@openerp.com-20120503125746-7a4x62x7qmj6uduz
---
 addons/mail/__openerp__.py                 | 6 +++---
 addons/mail/{ => data}/mail_data.xml       | 0
 addons/mail/{ => data}/mail_group_data.xml | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename addons/mail/{ => data}/mail_data.xml (100%)
 rename addons/mail/{ => data}/mail_group_data.xml (100%)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 81719794f69..47e3efdcb17 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -62,12 +62,12 @@ The main features are:
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_partner_view.xml',
+        'res_users_view.xml',
+        'data/mail_data.xml',
+        'data/mail_group_data.xml',
         'report/mail_message_report_view.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
-        'mail_data.xml',
-        'mail_group_data.xml',
-        'res_users_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mail/mail_data.xml b/addons/mail/data/mail_data.xml
similarity index 100%
rename from addons/mail/mail_data.xml
rename to addons/mail/data/mail_data.xml
diff --git a/addons/mail/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
similarity index 100%
rename from addons/mail/mail_group_data.xml
rename to addons/mail/data/mail_group_data.xml

From eb353da1da967735bb07820042a73f1d7753e783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 15:12:12 +0200
Subject: [PATCH 023/397] [IMP] mail.group: cleaned and added a demo data for
 all employees discussion group.

bzr revid: tde@openerp.com-20120503131212-ndqib39lcsb3cq2m
---
 addons/mail/data/mail_group_data.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index c2d1762d6ae..97a1eb59cc4 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -4,9 +4,16 @@
 
         <record model="mail.group" id="group_all_company">
             <field name="name">All Company</field>
+            <field name="description">All company users can come here and discuss.</field>
         </record>
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
+            <field name="models" eval="[(4, ref('crm.lead'))]"/>
+        </record>
+        <record model="mail.group" id="group_all_employees">
+            <field name="name">All Employees</field>
+            <field name="push_to_groups" eval="True"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
         </record>
 
     </data>

From eb1a665715bfed76fa25d495e06861789bef430f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 15:45:49 +0200
Subject: [PATCH 024/397] [IMP] mail module: res.users model: updated
 message_load override due to small changes in message prototype

bzr revid: tde@openerp.com-20120503134549-cv8qei59tps2xguq
---
 addons/mail/res_users.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 0f4fc080ee2..857a3c73ee0 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -67,8 +67,9 @@ class res_users(osv.osv):
         #self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context)
         return user_id
 
-    def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
-        """ Override of message_load
+    def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
+                        limit=100, offset=0, domain=None, count=False, context=None):
+        """ Override OpenChatter message_load method.
             User discussion page :
             - messages posted on res.users, res_id = user.id
             - messages directly sent to user with @user_login
@@ -78,5 +79,8 @@ class res_users(osv.osv):
         for user in self.browse(cr, uid, ids, context=context):
             msg_ids += msg_obj.search(cr, uid, ['|', '|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login)), '&', ('res_id', '=', user.id), ('model', '=', self._name)] + domain,
             limit=limit, offset=offset, context=context)
-        if (ascent): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
-        return msg_obj.read(cr, uid, msg_ids, context=context)
+        if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
+        if count:
+            return len(msg_ids)
+        else:
+            return msg_obj.read(cr, uid, msg_ids, context=context)

From ec432cea404886611c7547e054fb544e78d0651a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 May 2012 15:49:16 +0200
Subject: [PATCH 025/397] [IMP] mail.thread: res.users model: removed comments
 only preference for emails when receiving notifications.

bzr revid: tde@openerp.com-20120503134916-y031ko6ne94le6n0
---
 addons/mail/mail_thread.py | 1 -
 addons/mail/res_users.py   | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 693c26842c7..57a45107f2a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -149,7 +149,6 @@ class mail_thread(osv.osv):
                 email_to = ''
                 for user in res_users_obj.browse(cr, uid, user_to_push_ids, context=context):
                     if not user.notification_email_pref == 'all' and \
-                        not (user.notification_email_pref == 'comments' and vals['type'] == 'comment') and \
                         not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
                         continue
                     if not user.user_email:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 857a3c73ee0..4541c6bbceb 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -33,15 +33,15 @@ class res_users(osv.osv):
     _columns = {
         'notification_email_pref': fields.selection([
                         ('all', 'All feeds'),
-                        ('comments', 'Only comments'),
-                        ('to_me', 'Only when sent directly to me'),
+                        ('to_me', 'Only sent directly to me'),
                         ('none', 'Never')
                         ], 'Receive feeds by email', required=True,
-                        help="Choose in which case you want to receive an email when you receive new feeds."),
+                        help="Choose in which case you want to receive \
+                              an email when you receive new feeds."),
     }
     
     _defaults = {
-        'notification_email_pref': 'none',
+        'notification_email_pref': 'to_me',
     }
     
     def __init__(self, pool, cr):

From 7ce89441f27690f8e8f055f8f042a314c1ac2280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 7 May 2012 16:13:58 +0200
Subject: [PATCH 026/397] [IMP] mail.js: moved a function, added subtype when
 posting a comment

bzr revid: tde@openerp.com-20120507141358-vau7b9wgillyixg7
---
 addons/mail/static/src/js/mail.js | 111 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 55 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d9fae0fcefe..ce9eb97bc00 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,59 +4,6 @@ openerp.mail = function(session) {
     
     var mail = session.mail = {};
 
-    /**
-    * Add records to sorted_comments array
-    * @param {Array} records records from mail.message sorted by date desc
-    * @returns {Object} cs comments_structure: dict
-    *                      cs.model_to_root_ids = {model: [root_ids], }
-    *                      cs.new_root_ids = [new_root_ids]
-    *                      cs.root_ids = [root_ids]
-    *                      cs.msgs = {record.id: record,}
-    *                      cs.tree_struct = {record.id: {
-    *                          'level': record_level in hierarchy, 0 is root,
-    *                          'msg_nbr': number of childs,
-    *                          'direct_childs': [msg_ids],
-    *                          'all_childs': [msg_ids],
-    *                          'for_thread_msgs': [records],
-    *                          'ancestors': [msg_ids], } }
-    */
-    function tools_sort_comments(cs, records, parent_id) {
-        var cur_iter = 0; var max_iter = 10; var modif = true;
-        while ( modif && (cur_iter++) < max_iter) {
-            modif = false;
-            _(records).each(function (record) {
-                // root and not yet recorded
-                if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-                    // add to model -> root_list ids
-                    if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-                    else cs['model_to_root_ids'][record.model].push(record.id);
-                    // add root data
-                    cs['new_root_ids'].push(record.id);
-                    // add record
-                    cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-                    cs['msgs'][record.id] = record;
-                    modif = true;
-                }
-                // not yet recorded, but parent is recorded
-                else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-                    var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-                    // update parent structure
-                    cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-                    cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-                    // update ancestors structure
-                    for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-                        cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-                    }
-                    // add record
-                    cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-                    cs['msgs'][record.id] = record;
-                    modif = true;
-                }
-            });
-        }
-        return cs;
-    }
-
     /* Add ThreadDisplay widget to registry */
     session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
 //    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
@@ -399,7 +346,7 @@ openerp.mail = function(session) {
             var comment_node = this.$element.find('textarea');
             var body_text = comment_node.val();
             comment_node.val('');
-            return this.ds.call('message_append_note', [[this.params.res_id], 'Reply', body_text, this.params.parent_id, 'comment', 'html']).then(
+            return this.ds.call('message_append_note', [[this.params.res_id], 'Reply', body_text, this.params.parent_id, 'comment', 'html', 'comment']).then(
                 this.proxy('init_comments'));
         },
         
@@ -824,9 +771,63 @@ openerp.mail = function(session) {
             var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea');
             var body_text = comment_node.val();
             comment_node.val('');
-            var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
+            var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html', 'tweet']).then(this.proxy('init_and_fetch_comments'));
         },
     });
+    
+    
+    /**
+    * Add records to sorted_comments array
+    * @param {Array} records records from mail.message sorted by date desc
+    * @returns {Object} cs comments_structure: dict
+    *                      cs.model_to_root_ids = {model: [root_ids], }
+    *                      cs.new_root_ids = [new_root_ids]
+    *                      cs.root_ids = [root_ids]
+    *                      cs.msgs = {record.id: record,}
+    *                      cs.tree_struct = {record.id: {
+    *                          'level': record_level in hierarchy, 0 is root,
+    *                          'msg_nbr': number of childs,
+    *                          'direct_childs': [msg_ids],
+    *                          'all_childs': [msg_ids],
+    *                          'for_thread_msgs': [records],
+    *                          'ancestors': [msg_ids], } }
+    */
+    function tools_sort_comments(cs, records, parent_id) {
+        var cur_iter = 0; var max_iter = 10; var modif = true;
+        while ( modif && (cur_iter++) < max_iter) {
+            modif = false;
+            _(records).each(function (record) {
+                // root and not yet recorded
+                if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
+                    // add to model -> root_list ids
+                    if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
+                    else cs['model_to_root_ids'][record.model].push(record.id);
+                    // add root data
+                    cs['new_root_ids'].push(record.id);
+                    // add record
+                    cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
+                    cs['msgs'][record.id] = record;
+                    modif = true;
+                }
+                // not yet recorded, but parent is recorded
+                else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
+                    var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
+                    // update parent structure
+                    cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
+                    cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
+                    // update ancestors structure
+                    for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
+                        cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
+                    }
+                    // add record
+                    cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
+                    cs['msgs'][record.id] = record;
+                    modif = true;
+                }
+            });
+        }
+        return cs;
+    }
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 120fb61af38ec9f95aa443365ce7eab909a96e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 7 May 2012 17:10:23 +0200
Subject: [PATCH 027/397] [IMP] share: when creating a shared access, the send
 email now contains the password and the action_id to directly redirect to the
 shared view.

bzr revid: tde@openerp.com-20120507151023-f1rpwqz4eqjmssjv
---
 addons/share/wizard/share_wizard.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 07004f333a8..fdc9e18ab79 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -902,8 +902,11 @@ class share_result_line(osv.osv_memory):
     def _share_url(self, cr, uid, ids, _fieldname, _args, context=None):
         result = dict.fromkeys(ids, '')
         for this in self.browse(cr, uid, ids, context=context):
-            data = dict(dbname=cr.dbname, login=this.login, password='')
-            result[this.id] = this.share_wizard_id.share_url_template() % data
+            data = dict(dbname=cr.dbname, login=this.login, password=this.password)
+            if this.share_wizard_id and this.share_wizard_id.action_id:
+                data['action_id'] = this.share_wizard_id.action_id.id
+            ctx = dict(context, share_url_template_hash_arguments=['action_id'])
+            result[this.id] = this.share_wizard_id.share_url_template(context=ctx) % data
         return result
 
     _columns = {

From 843c33d10b13a82ce4c349487cacfe4b7f834d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 May 2012 15:55:09 +0200
Subject: [PATCH 028/397] [REM] Removed mail.message access rights defined in
 various modules. mail.message access rights will be defined as attachments.

bzr revid: tde@openerp.com-20120508135509-ujeqpgh83uui6nbz
---
 addons/crm/security/ir.model.access.csv              | 2 --
 addons/hr_recruitment/security/ir.model.access.csv   | 1 -
 addons/project/security/ir.model.access.csv          | 1 -
 addons/project_issue/security/ir.model.access.csv    | 2 --
 addons/project_mailgate/__openerp__.py               | 2 +-
 addons/project_mailgate/security/ir.model.access.csv | 2 --
 6 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 addons/project_mailgate/security/ir.model.access.csv

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7707118324f..cc894407658 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -27,13 +27,11 @@ access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_r
 access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1
 access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0
 access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0
-mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0
 access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
 access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1
 access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
-mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1
 access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
 access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1
 access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6bbc30b7b41..8b3bd48bcb6 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -3,7 +3,6 @@ access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user
 access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
 access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,1,1,1
 access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
-access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1
 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0
 access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 5b51dc85e7c..cb82f9896a4 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -16,4 +16,3 @@ access_account_analytic_line_project,account.analytic.line project,analytic.mode
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
-access_mail_message_project_user,project.mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 4708a6fdcd6..3cee5d1dc8b 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -4,8 +4,6 @@ access_project_issue_report_all,project.issue.report,model_project_issue_report,
 access_crm_case_categ_id,crm.case.categ,crm.model_crm_case_categ,project.group_project_manager,1,1,1,1
 access_project_issue_version_project,project_issue_version manager,model_project_issue_version,project.group_project_manager,1,1,1,1
 access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0
-access_mail_message_project_manager,mail.message.manager,mail.model_mail_message,project.group_project_manager,1,1,1,1
 access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1
 access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0
-access_mail_message_issue_project_user,mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0
 access_crm_case_section,crm.case.section,crm.model_crm_case_section,project.group_project_user,1,0,0,0
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index f2ac59c9fb1..6f521f436fa 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -45,7 +45,7 @@ There are two common alternatives to configure the mailbox integration:
 
     """,
     "init_xml": [],
-    "update_xml": ["security/ir.model.access.csv",
+    "update_xml": [
         "project_mailgate_view.xml",
     ],
     'demo_xml': [
diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv
deleted file mode 100644
index 6c495169161..00000000000
--- a/addons/project_mailgate/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message_project_user,project.mail.message.user,mail.model_mail_message,project.group_project_user,1,1,1,0

From d001c67f993d63188ecb67f7e224d8ecba5b26cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 May 2012 15:56:00 +0200
Subject: [PATCH 029/397] [IMP] mail.message: modified default access rights:
 now accessible, but will be restricted by rights of the related document (as
 for attachments)

bzr revid: tde@openerp.com-20120508135600-6u231f63f9h9toqf
---
 addons/mail/mail_message.py              | 44 +++++++++++++++++++++++-
 addons/mail/security/ir.model.access.csv |  4 +--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a276388444e..38234ddae0e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -135,7 +135,7 @@ class mail_message_common(osv.TransientModel):
         'date': (lambda *a: fields.datetime.now()),
     }
 
-class mail_message(osv.osv):
+class mail_message(osv.Model):
     """Model holding messages: system notification (replacing res.log
        notifications), comments (for OpenChatter feature) and
        RFC2822 email messages. This model also provides facilities to
@@ -245,12 +245,54 @@ class mail_message(osv.osv):
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
+    def check(self, cr, uid, ids, mode, context=None, values=None):
+        """Restricts the access to a mail.message, according to referred model
+        """
+        if not ids:
+            return
+        res_ids = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        cr.execute('SELECT DISTINCT model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
+        for rmod, rid in cr.fetchall():
+            if not (rmod and rid):
+                continue
+            res_ids.setdefault(rmod,set()).add(rid)
+        if values:
+            if 'res_model' in values and 'res_id' in values:
+                res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
+
+        ima_obj = self.pool.get('ir.model.access')
+        for model, mids in res_ids.items():
+            # ignore mail messages that are not attached to a resource anymore when checking access rights
+            # (resource was deleted but attachment was not)
+            mids = self.pool.get(model).exists(cr, uid, mids)
+            ima_obj.check(cr, uid, model, mode)
+            self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
+    
+    def create(self, cr, uid, values, context=None):
+        self.check(cr, uid, [], mode='create', context=context, values=values)
+        return super(mail_message, self).create(cr, uid, values, context)
+
+    def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
+        self.check(cr, uid, ids, 'read', context=context)
+        return super(mail_message, self).read(cr, uid, ids, fields_to_read, context, load)
+
     def copy(self, cr, uid, id, default=None, context=None):
         """Overridden to avoid duplicating fields that are unique to each email"""
         if default is None:
             default = {}
+        self.check(cr, uid, ids, 'read', context=context)
         default.update(message_id=False,original=False,headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        self.check(cr, uid, ids, 'write', context=context, values=vals)
+        return super(mail_message, self).write(cr, uid, ids, vals, context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        self.check(cr, uid, ids, 'unlink', context=context)
+        return super(mail_message, self).unlink(cr, uid, ids, context)
 
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False,
                              email_cc=None, email_bcc=None, reply_to=False, attachments=None,
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 3cfd4e88f3d..bf76d4ba977 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,model_mail_message,,1,0,1,0
-access_mail_message_all,mail.message.all,model_mail_message,base.group_user,1,1,1,1
+access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
+access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1

From 4510e8e9968f0ec59b905ef26234e239e3494afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 May 2012 16:07:50 +0200
Subject: [PATCH 030/397] [IMP] mail: access rights: added access rights for
 mail.subscription.hide

bzr revid: tde@openerp.com-20120508140750-5te2gpuad253o8fk
---
 addons/mail/security/ir.model.access.csv | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index bf76d4ba977..f3b481b2ae9 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -2,7 +2,8 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
-access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
+access_mail_subscription_all,mail.subscription.all,model_mail_subscription,,1,1,1,1
+access_mail_subscription_hide_all,mail.subscription.hide.all,model_mail_subscription_hide,,1,1,1,1
+access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
 access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0

From 8773d714d2f410a1537561153ec5781921365f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 May 2012 16:54:15 +0200
Subject: [PATCH 031/397] [IMP] Thread widget: line breaks are preserved when
 displaying widget (converted into <br />). <br /> html tag is now authorized,
 by the way, along with <b> and <em>.

bzr revid: tde@openerp.com-20120508145415-5t7mb20u5tk6bpsg
---
 addons/mail/static/src/js/mail.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ce9eb97bc00..65923805f86 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -264,6 +264,7 @@ openerp.mail = function(session) {
          * Display a record
          */
         display_comment: function (record) {
+            record.body = this.do_text_nl2br(record.body, true);
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
             else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
@@ -424,10 +425,15 @@ openerp.mail = function(session) {
         },
         
         do_clean_text: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em)\\s*&gt;', 'gi'), '<$1$2>');
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
         },
         
+        do_text_nl2br: function (str, is_xhtml) {   
+            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
+        },
+        
         /**
          *
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);

From b16bc964110e36ee294d4d7a2673377c05a9ad3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 9 May 2012 11:24:37 +0200
Subject: [PATCH 032/397] [IMP] mail.message: added 'oldname' attribute to the
 content_subtype field that was subtype

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

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 38234ddae0e..3d3df37cc71 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -119,8 +119,9 @@ class mail_message_common(osv.TransientModel):
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'content_subtype': fields.char('Message content subtype', size=32,
-                                            help="Type of message, usually 'html' or 'plain', used to "
-                                                 "select plain-text or rich-text contents accordingly", readonly=1),
+                                            oldname="subtype", readonly=1,
+                                            help="Type of message, usually 'html' or 'plain', used to \
+                                                  select plain-text or rich-text contents accordingly"),
         'body_text': fields.text('Text contents', help="Plain-text version of the message"),
         'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text',

From c98f1ff577844cc26f7086c27cd97a2e2aed250b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 9 May 2012 17:15:45 +0200
Subject: [PATCH 033/397] [IMP] mail.compose.message form view: slighty cleaned
 form

bzr revid: tde@openerp.com-20120509151545-zsfu1ihfc83q5t55
---
 .../mail/wizard/mail_compose_message_view.xml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ae62c2102c5..7090232b0d3 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -12,17 +12,17 @@
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
 -->
-			<field name='filter_id'/>
-<!--
                         <field name='filter_id' invisible="context.get('active_model',False)"/>
--->
                         <newline/>
-			<field name="email_from" colspan="4" required="1"/>
-                        <field name="email_to" colspan="4" required="1"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="email_bcc" colspan="4"/>
-                        <field name="reply_to" colspan="4"/>
-                        <field name="subject" colspan="4" widget="char" size="512"/>
+			<group colspan="4" col="4">
+			    <field name="email_from" colspan="4" required="1"/>
+			    <field name="email_to" colspan="4" required="1"/>
+			    <field name="email_cc" colspan="4"/>
+			    <field name="email_bcc" colspan="4"/>
+			    <field name="reply_to" colspan="4"/>
+			    <field name="subject" colspan="4" widget="char" size="512"/>
+			</group>
+			<newline/>
 			<separator string="Debug information" colspan="6"/>
 			<field name="model"/>
                         <field name="res_id"/>

From e2098b604704188c3b849a162231a80ce54ffc28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 09:28:45 +0200
Subject: [PATCH 034/397] [TMP] Add demo data for mail servers, to be removed
 when merging. Added for testing facility.

bzr revid: tde@openerp.com-20120510072845-3ttc7m061nxg9fgg
---
 addons/hr_recruitment/hr_recruitment_data.xml | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index d6cb5952d38..cadce2c08f0 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -3,6 +3,27 @@
 <data noupdate="1">
 
 
+        <record id="outgoing_test" model="ir.mail_server">
+            <field name="smtp_host">smtp.openerp.com</field>
+            <field name="name">smtp.openerp.com</field>
+            <field name="smtp_encryption">starttls</field>
+            <field name="smtp_port">2525</field>
+            <field name="smtp_user">tde</field>
+        </record>
+
+
+        <record id="fetchmail_hr_applicant_test" model="fetchmail.server">
+            <field name="object_id" ref="hr_recruitment.model_hr_applicant"/>
+            <field name="attach" eval="True"/>
+            <field name="original" eval="False"/>
+            <field name="server">imap.openerp.com</field>
+            <field name="name">imap.openerp.com</field>
+            <field name="user">tde</field>
+            <field name="is_ssl">True</field>
+            <field name="port">993</field>
+            <field name="type">imap</field>
+        </record>
+
         <!--    HR Recruitment Source        -->
 
     <record model="hr.recruitment.source" id="source_linkedin">

From 82dcce2c1df48304af875e1bf90b5faa80741c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 09:35:20 +0200
Subject: [PATCH 035/397] [IMP] mail.message: form view: message_id and
 reference moved to advanced

bzr revid: tde@openerp.com-20120510073520-2fdbntv7jj1bsh3n
---
 addons/mail/mail_message_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8e504556bd4..871303ce00e 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -99,8 +99,6 @@
                                 <field name="model"/>
                                 <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
                                 <field name="res_id"/>
-                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
-                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Body (Rich)" attrs="{'invisible':[('content_subtype','=','plain')]}">
@@ -128,8 +126,16 @@
                             <group col="2" colspan="4">
                                 <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
                                 <field name="auto_delete"/>
-                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+                                <field name="headers" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                <field name="original" attrs="{'invisible':[('original', '=', False)]}"/>
+                                <field name="message_id"/>
+<!--
+                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+-->
+                                <field name="references"/>
+<!--
+                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+-->
                             </group>
                         </page>
                     </notebook>

From 931302eca050ab540f6031bd7b4e23a7983ed12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:10:58 +0200
Subject: [PATCH 036/397] [IMP] Thread widget: cleaned links, added reply by
 e-mail links. Added in mail.compose.message wizard support for a 'message_id'
 in context have a document with reply behavior. Also cleaned a bit the
 mail;js code. Updated a detail in a default temporary data in hr_recruitment.

bzr revid: tde@openerp.com-20120510121058-a2emjtvm227603ou
---
 addons/hr_recruitment/hr_recruitment_data.xml |  1 +
 addons/mail/static/src/css/mail.css           |  7 +-
 addons/mail/static/src/js/mail.js             | 87 ++++++++++++-------
 addons/mail/static/src/xml/mail.xml           | 46 ++++++----
 addons/mail/wizard/mail_compose_message.py    | 13 ++-
 5 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index cadce2c08f0..fbf48897d83 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -9,6 +9,7 @@
             <field name="smtp_encryption">starttls</field>
             <field name="smtp_port">2525</field>
             <field name="smtp_user">tde</field>
+            <field name="sequence">9</field>
         </record>
 
 
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 5bae0d5e73b..e0d001a64fa 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -120,6 +120,10 @@
     padding: 5px;
 }
 
+.openerp .oe_mail_compose img{
+    max-height: 25px;
+}
+
 /* ------------------------------ */
 /* ThreadDisplay                  */
 /* ------------------------------ */
@@ -236,10 +240,7 @@
 }
 
 .openerp ul.oe_mail_msg_menu {
-/*
     display: none;
-*/
-    display: block;
     position: absolute;
     top: 1em;
     right: 1em;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 65923805f86..b49181eeaf0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,12 +4,8 @@ openerp.mail = function(session) {
     
     var mail = session.mail = {};
 
-    /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
-//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
-
     /** 
-     * ThreadDisplay widget: this widget handles the display of a thread of
+     * Thread widget: this widget handles the display of a thread of
      * messages. The [thread_level] parameter sets the thread level number:
      * - root message
      * - - sub message (parent_id = root message)
@@ -18,22 +14,28 @@ openerp.mail = function(session) {
      * This widget has 2 ways of initialization, either you give records to be rendered,
      * either it will fetch [limit] messages related to [res_model]:[res_id].
      */
+
+    /* Add ThreadDisplay widget to registry */
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+
+    /* Thread is an extension of a Widget */
     mail.Thread = session.web.Widget.extend({
         template: 'Thread',
 
         /**
          * @param {Object} parent parent
          * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of mail.thread object
-         * @param {Number} [params.res_id] res_id of record
-         * @param {Number} [params.parent_id=false] parent_id of message
-         * @param {Number} [params.uid] user id
+         * @param {String} [params.res_model] res_model of document [REQUIRED]
+         * @param {Number} [params.res_id] res_id of record [REQUIRED]
+         * @param {Number} [params.uid] user id [REQUIRED]
+         * @param {Bool}   [params.parent_id=false] parent_id of message
          * @param {Number} [params.thread_level=0] number of levels in the thread (only 0 or 1 currently)
-         * @param {Number} [params.msg_more_limit=100] number of character to display before having a "show more" link;
+         * @param {Bool}   [params.wall=false] thread is displayed in the wall
+         * @param {Number} [params.msg_more_limit=150] number of character to display before having a "show more" link;
          *                                             note that the text will not be truncated if it does not have 110% of
          *                                             the parameter (ex: 110 characters needed to be truncated and be displayed
          *                                             as a 100-characters message)
-         * @param {Number} [params.limit=10] maximum number of messages to fetch
+         * @param {Number} [params.limit=100] maximum number of messages to fetch
          * @param {Number} [params.offset=0] offset for fetching messages
          * @param {Number} [params.records=null] records to show instead of fetching messages
          */
@@ -42,7 +44,8 @@ openerp.mail = function(session) {
             this.params = params;
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
-            this.params.msg_more_limit = this.params.msg_more_limit || 100;
+            this.params.wall = this.params.wall || this.params.records || false;
+            this.params.msg_more_limit = this.params.msg_more_limit || 150;
             this.params.limit = this.params.limit || 100;
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
@@ -55,11 +58,13 @@ openerp.mail = function(session) {
             // display customization vars
             this.display = {};
             this.display.show_post_comment = this.params.show_post_comment || false;
+            this.display.show_msg_menu = this.params.wall;
             this.display.show_reply = (this.params.thread_level > 0);
-            this.display.show_delete = true;
-            this.display.show_hide = this.params.show_hide || false;
+            this.display.show_delete = ! this.params.wall;
+            this.display.show_hide = this.params.wall;
+            this.display.show_reply_by_email = ! this.params.wall;
             this.display.show_more = (this.params.thread_level == 0);
-            // not used currently
+            // internal links mapping
             this.intlinks_mapping = {};
         },
         
@@ -96,7 +101,6 @@ openerp.mail = function(session) {
             });
             // event: click on 'delete' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
-                //console.log('deleting');
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
@@ -109,11 +113,9 @@ openerp.mail = function(session) {
             });
             // event: click on 'hide' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
-                //console.log('hiding');
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                //console.log(msg_id);
                 var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
@@ -121,14 +123,33 @@ openerp.mail = function(session) {
                 }
                 return false;
             });
-            // event: click on 'hide notification' in wheel_menu
+            // event: click on "reply by email" in msg
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
+                console.log('reply by e-mail');
+                var msg_id = event.srcElement.dataset.id;
+                if (! msg_id) return false;
+                self.do_action({
+                        type: 'ir.actions.act_window',
+                        res_model: 'mail.compose.message',
+                        views: [[false, 'form']],
+                        view_type: 'form',
+                        view_mode: 'form',
+                        target: 'new',
+                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'message_id': msg_id, 'mail.compose.message.mode': 'reply'},
+                        key2: 'client_action_multi',
+                });
+                return false;
+            });
+            // event: click on the wheel menu in messages
+            this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) {
+                self.$element.find('ul.oe_mail_msg_menu').toggle();
+            });
+            // event: click on 'hide' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_thread', 'click', function (event) {
-                console.log('hiding notification');
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
-                console.log(msg_id);
-                //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
+                var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
@@ -137,11 +158,11 @@ openerp.mail = function(session) {
             });
             // event: click on 'hide this type' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
-                //console.log('hiding type');
-                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
+                console.log('hiding type');
+                if (! confirm(_t("Do you really want to hide this type of thread ?"))) { return false; }
                 var subtype = event.srcElement.dataset.subtype;
                 if (! subtype) return false;
-                //console.log(subtype);
+                console.log(subtype);
                 var call_defer = self.ds.call('message_subscription_hide', [[self.params.res_id], subtype]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
@@ -168,13 +189,8 @@ openerp.mail = function(session) {
                 }
                 else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
             });
-            // event: click on the wheel menu in messages
-            this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) {
-                self.$element.find('ul.oe_mail_msg_menu').toggle();
-            });
             // event: click on "send an email"
             this.$element.find('div.oe_mail_thread_act').delegate('a.oe_mail_compose', 'click', function (event) {
-                console.log('cacaprout');
                 self.do_action({
                         type: 'ir.actions.act_window',
                         res_model: 'mail.compose.message',
@@ -182,12 +198,11 @@ openerp.mail = function(session) {
                         view_type: 'form',
                         view_mode: 'form',
                         target: 'new',
-                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'mail.compose.message.mode': 'new'},
+                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'mail.compose.message.mode': 'document'},
                         key2: 'client_action_multi',
                 });
                 return false;
             });
-            
         },
         
         destroy: function () {
@@ -271,6 +286,8 @@ openerp.mail = function(session) {
             record.body = this.do_clean_text(record.body);
             record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
+            console.log(record.body);
+            console.log(record.tr_body);
             if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
@@ -781,7 +798,11 @@ openerp.mail = function(session) {
         },
     });
     
-    
+
+    /**
+     *    TOOLS
+     */
+
     /**
     * Add records to sorted_comments array
     * @param {Array} records records from mail.message sorted by date desc
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 05adf4b5141..32f3e5665e0 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,11 +45,14 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <a href="#" class="oe_mail_compose">Repley by e-mail</a><br />
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
+            <p><a href="#" class="oe_mail_compose oe_mail_oe_right">
+                Send an e-mail
+                <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
+            </a></p>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
@@ -67,8 +70,10 @@
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
+                <t t-if="record.type == 'email'"><t t-call="EmailDisplay"/></t>
+                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay"/></t>
+                <br />Message-id: <t t-esc="record.message_id"/>
+                <br />References: <t t-esc="record.references"/>
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
@@ -86,13 +91,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t>
-            </t>
+            <span class="oe_mail_oe_right">
+                <t t-call="MessageDisplayManageLinks"/>
+            </span>
         </p>
     </t>
     
@@ -101,7 +102,6 @@
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
-            <br />
             <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
             <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -110,13 +110,25 @@
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
-            </t>
+            <span class="oe_mail_oe_right">
+                <t t-call="MessageDisplayManageLinks"/>
+            </span>
         </p>
     </t>
 
+    <t t-name="MessageDisplayManageLinks">
+        <t t-if="display['show_reply']">
+            <a href="#" class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply">Reply</a>
+        </t>
+        <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_delete">Delete</a>
+        </t></t>
+        <t t-if="display['show_hide']">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
+        </t>
+        <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
+        </t></t>
+    </t>
+
 </template>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 110d8dd09a0..767cf5f28c9 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -67,7 +67,6 @@ class mail_compose_message(osv.osv_memory):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         """
-        print context
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
@@ -76,14 +75,22 @@ class mail_compose_message(osv.osv_memory):
         if (not reply_mode) and context.get('active_model') and context.get('active_id'):
             # normal mode when sending an email related to any document, as specified by
             # active_model and active_id in context
-            vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
+            # if a message_id is specified in context, this means we send an e-mail related
+            # to a document, but based on a previous e-mail
+            if context.get('message_id'):
+                vals = self.get_message_data(cr, uid, int(context['message_id']), context=context)
+            vals.update(self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context))
         elif reply_mode and context.get('active_id'):
             # reply mode, consider active_id is the ID of a mail.message to which we're
             # replying
-            vals = self.get_message_data(cr, uid, int(context['active_id']), context)
+            if context.get('message_id'):
+                vals = self.get_message_data(cr, uid, int(context['message_id']), context=context)
+            else:
+                vals = self.get_message_data(cr, uid, int(context['active_id']), context)
         else:
             # default mode
             result['model'] = context.get('active_model', False)
+        
         for field in vals:
             if field in fields:
                 result.update({field : vals[field]})

From ada6b77b81db7c76773ee71ded79371163df3de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:17:25 +0200
Subject: [PATCH 037/397] [ADD] js: added expander jquery extension. This
 extension provides a read more/read less feature, way better implemented than
 the hardcoded basic stuff used previously in mail.js. This extension is under
 MIT/GPL licence.

bzr revid: tde@openerp.com-20120510121725-fquwp3rkrsterdey
---
 .../mail/static/src/js/jquery.expander.min.js | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 addons/mail/static/src/js/jquery.expander.min.js

diff --git a/addons/mail/static/src/js/jquery.expander.min.js b/addons/mail/static/src/js/jquery.expander.min.js
new file mode 100644
index 00000000000..2c61251fcf0
--- /dev/null
+++ b/addons/mail/static/src/js/jquery.expander.min.js
@@ -0,0 +1,24 @@
+/*!
+ * jQuery Expander Plugin v1.4.2
+ *
+ * Date: Sat Mar 31 20:51:48 2012 EDT
+ * Requires: jQuery v1.3+
+ *
+ * Copyright 2011, Karl Swedberg
+ * Dual licensed under the MIT and GPL licenses (just like jQuery):
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ *
+ *
+ *
+*/
+(function(c){c.expander={version:"1.4.2",defaults:{slicePoint:100,preserveWords:true,widow:4,expandText:"read more",expandPrefix:"&hellip; ",expandAfterSummary:false,summaryClass:"summary",detailClass:"details",moreClass:"read-more",lessClass:"read-less",collapseTimer:0,expandEffect:"slideDown",expandSpeed:250,collapseEffect:"slideUp",collapseSpeed:200,userCollapse:true,userCollapseText:"read less",userCollapsePrefix:" ",onSlice:null,beforeExpand:null,afterExpand:null,onCollapse:null}};c.fn.expander=
+function(l){function J(a,d){var g="span",h=a.summary;if(d){g="div";if(x.test(h)&&!a.expandAfterSummary)h=h.replace(x,a.moreLabel+"$1");else h+=a.moreLabel;h='<div class="'+a.summaryClass+'">'+h+"</div>"}else h+=a.moreLabel;return[h,"<",g+' class="'+a.detailClass+'"',">",a.details,"</"+g+">"].join("")}function K(a){var d='<span class="'+a.moreClass+'">'+a.expandPrefix;d+='<a href="#">'+a.expandText+"</a></span>";return d}function y(a,d){if(a.lastIndexOf("<")>a.lastIndexOf(">"))a=a.slice(0,a.lastIndexOf("<"));
+if(d)a=a.replace(L,"");return c.trim(a)}function z(a,d){d.stop(true,true)[a.collapseEffect](a.collapseSpeed,function(){d.prev("span."+a.moreClass).show().length||d.parent().children("div."+a.summaryClass).show().find("span."+a.moreClass).show()})}function M(a,d,g){if(a.collapseTimer)A=setTimeout(function(){z(a,d);c.isFunction(a.onCollapse)&&a.onCollapse.call(g,false)},a.collapseTimer)}var v="init";if(typeof l=="string"){v=l;l={}}var o=c.extend({},c.expander.defaults,l),N=/^<(?:area|br|col|embed|hr|img|input|link|meta|param).*>$/i,
+L=o.wordEnd||/(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+)$/,B=/<\/?(\w+)[^>]*>/g,C=/<(\w+)[^>]*>/g,D=/<\/(\w+)>/g,x=/(<\/[^>]+>)\s*$/,O=/^<[^>]+>.?/,A;l={init:function(){this.each(function(){var a,d,g,h,m,i,p,w,E=[],t=[],q={},r=this,f=c(this),F=c([]),b=c.meta?c.extend({},o,f.data()):o;i=!!f.find("."+b.detailClass).length;var s=!!f.find("*").filter(function(){return/^block|table|list/.test(c(this).css("display"))}).length,u=(s?"div":"span")+"."+b.detailClass,G="span."+b.moreClass,P=b.expandSpeed||0,n=c.trim(f.html());
+c.trim(f.text());var e=n.slice(0,b.slicePoint);if(!c.data(this,"expander")){c.data(this,"expander",true);c.each(["onSlice","beforeExpand","afterExpand","onCollapse"],function(j,k){q[k]=c.isFunction(b[k])});e=y(e);for(d=e.replace(B,"").length;d<b.slicePoint;){a=n.charAt(e.length);if(a=="<")a=n.slice(e.length).match(O)[0];e+=a;d++}e=y(e,b.preserveWords);h=e.match(C)||[];m=e.match(D)||[];g=[];c.each(h,function(j,k){N.test(k)||g.push(k)});h=g;d=m.length;for(a=0;a<d;a++)m[a]=m[a].replace(D,"$1");c.each(h,
+function(j,k){var H=k.replace(C,"$1"),I=c.inArray(H,m);if(I===-1){E.push(k);t.push("</"+H+">")}else m.splice(I,1)});t.reverse();if(i){i=f.find(u).remove().html();e=f.html();n=e+i;a=""}else{i=n.slice(e.length);a=c.trim(i.replace(B,""));if(a===""||a.split(/\s+/).length<b.widow)return;a=t.pop()||"";e+=t.join("");i=E.join("")+i}b.moreLabel=f.find(G).length?"":K(b);if(s)i=n;e+=a;b.summary=e;b.details=i;b.lastCloseTag=a;if(q.onSlice)b=(g=b.onSlice.call(r,b))&&g.details?g:b;s=J(b,s);f.html(s);p=f.find(u);
+w=f.find(G);p.hide();w.find("a").unbind("click.expander").bind("click.expander",function(j){j.preventDefault();w.hide();F.hide();q.beforeExpand&&b.beforeExpand.call(r);p.stop(false,true)[b.expandEffect](P,function(){p.css({zoom:""});q.afterExpand&&b.afterExpand.call(r);M(b,p,r)})});F=f.find("div."+b.summaryClass);b.userCollapse&&!f.find("span."+b.lessClass).length&&f.find(u).append('<span class="'+b.lessClass+'">'+b.userCollapsePrefix+'<a href="#">'+b.userCollapseText+"</a></span>");f.find("span."+
+b.lessClass+" a").unbind("click.expander").bind("click.expander",function(j){j.preventDefault();clearTimeout(A);j=c(this).closest(u);z(b,j);q.onCollapse&&b.onCollapse.call(r,true)})}})},destroy:function(){if(this.data("expander")){this.removeData("expander");this.each(function(){var a=c(this),d=c.meta?c.extend({},o,a.data()):o,g=a.find("."+d.detailClass).contents();a.find("."+d.moreClass).remove();a.find("."+d.summaryClass).remove();a.find("."+d.detailClass).after(g).remove();a.find("."+d.lessClass).remove()})}}};
+l[v]&&l[v].call(this);return this};c.fn.expander.defaults=c.expander.defaults})(jQuery);

From d54b9df3119c4861080edfba89d0bff199bb52c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:17:49 +0200
Subject: [PATCH 038/397] [IMP] Thread widget: added use of expander extension
 instead of the custom hardcoded stuff.

bzr revid: tde@openerp.com-20120510121749-m3oq3ko5omd08puc
---
 addons/mail/__openerp__.py          |  1 +
 addons/mail/static/src/js/mail.js   | 17 +----------------
 addons/mail/static/src/xml/mail.xml |  8 ++------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 47e3efdcb17..b85b367398c 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -88,6 +88,7 @@ The main features are:
         'static/src/css/mail_group.css',
     ],
     'js': [
+        'static/src/js/jquery.expander.min.js',
         'static/src/js/mail.js',
     ],
     'qweb': [
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b49181eeaf0..2081f8183b9 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -284,24 +284,14 @@ openerp.mail = function(session) {
             else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
             record.body = this.do_clean_text(record.body);
-            record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
-            console.log(record.body);
-            console.log(record.tr_body);
-            if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
+            this.$element.find('span.oe_mail_msg_body:last').expander();
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // render
             $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
                     ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
             // truncated: hide full-text, show summary, add buttons
-            if (record.tr_body) {
-                var node_body = this.$element.find('span.oe_mail_msg_body:last').append(' <a href="#" class="reduce">[ ... Show less]</a>');
-                var node_body_short = this.$element.find('span.oe_mail_msg_body_short:last').append(' <a href="#" class="expand">[ ... Show more]</a>');
-                node_body.hide();
-                node_body.find('a:last').click(function() { node_body.hide(); node_body_short.show(); return false; });
-                node_body_short.find('a:last').click(function() { node_body_short.hide(); node_body.show(); return false; });
-            }
         },
        
         /**
@@ -436,11 +426,6 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
         
-        do_truncate_string: function(string, max_length) {
-            if (string.length <= (max_length * 1.2)) return false;
-            else return string.slice(0, max_length);
-        },
-        
         do_clean_text: function (string) {
             var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 32f3e5665e0..cc423767b81 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -84,9 +84,7 @@
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-            <br />
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span><br />
             <span class="oe_mail_oe_fade">
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
@@ -107,9 +105,7 @@
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
         </p>
         <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-            <br />
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span><br />
             <span class="oe_mail_oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>

From 0c102754d4f591c95407cfb54fefe3bb1b216bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:31:56 +0200
Subject: [PATCH 039/397] [IMP] Thread widget: added options in expander used
 to truncate message content.

bzr revid: tde@openerp.com-20120510123156-0khgojmvvijp4gik
---
 addons/mail/static/src/css/mail.css | 2 +-
 addons/mail/static/src/js/mail.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e0d001a64fa..a912570c3de 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -230,7 +230,7 @@
     border-bottom: 1px solid #D2D9E7;
 }
 
-.openerp span.oe_mail_msg_body a.reduce, .openerp span.oe_mail_msg_body_short a.expand {
+.openerp a.oe_mail_expand, .openerp a.oe_mail_reduce {
     color: #4E43E7;
 }
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2081f8183b9..da0ac27e2ff 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -285,7 +285,7 @@ openerp.mail = function(session) {
             // body text manipulation
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
-            this.$element.find('span.oe_mail_msg_body:last').expander();
+            this.$element.find('span.oe_mail_msg_body:last').expander({slicePoint: this.params.msg_more_limit, moreClass: 'oe_mail_expand', lesClass: 'oe_mail_reduce'});
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // render

From b7fb55b5be49168b68aab64bb959b8af8791dbe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 15:54:47 +0200
Subject: [PATCH 040/397] [FIX] mail.message: when calling message_parsing to
 parse an email into en mail.message, the date is now converted from the email
 timezone to the server timezone. Also added context in method. Also renamed a
 fields var to msg_fields, to avoid conflicts with the fields module.

bzr revid: tde@openerp.com-20120510135447-if87oip7uodcn8ul
---
 addons/mail/mail_message.py | 39 +++++++++++++++++++++----------------
 addons/mail/mail_thread.py  |  3 +--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3d3df37cc71..80288bd8bda 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -30,11 +30,13 @@ import datetime
 from email.header import decode_header
 from email.message import Message
 
-import tools
+from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
+import pytz
+from tools import DEFAULT_SERVER_DATETIME_FORMAT
 from tools.translate import _
-from openerp import SUPERUSER_ID
+import tools
 
 _logger = logging.getLogger('mail')
 
@@ -410,7 +412,7 @@ class mail_message(osv.Model):
             _logger.exception("Failed processing mail queue")
         return res
 
-    def parse_message(self, message, save_original=False):
+    def parse_message(self, message, save_original=False, context=None):
         """Parses a string or email.message.Message representing an
            RFC-2822 email, and returns a generic dict holding the
            message details.
@@ -467,45 +469,48 @@ class mail_message(osv.Model):
             msg_txt['message-id'] = message_id
             _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
 
-        fields = msg_txt.keys()
+        msg_fields = msg_txt.keys()
         msg['id'] = message_id
         msg['message-id'] = message_id
 
-        if 'Subject' in fields:
+        if 'Subject' in msg_fields:
             msg['subject'] = decode(msg_txt.get('Subject'))
 
-        if 'Content-Type' in fields:
+        if 'Content-Type' in msg_fields:
             msg['content-type'] = msg_txt.get('Content-Type')
 
-        if 'From' in fields:
+        if 'From' in msg_fields:
             msg['from'] = decode(msg_txt.get('From') or msg_txt.get_unixfrom())
 
-        if 'To' in fields:
+        if 'To' in msg_fields:
             msg['to'] = decode(msg_txt.get('To'))
 
-        if 'Delivered-To' in fields:
+        if 'Delivered-To' in msg_fields:
             msg['to'] = decode(msg_txt.get('Delivered-To'))
 
-        if 'CC' in fields:
+        if 'CC' in msg_fields:
             msg['cc'] = decode(msg_txt.get('CC'))
 
-        if 'Cc' in fields:
+        if 'Cc' in msg_fields:
             msg['cc'] = decode(msg_txt.get('Cc'))
 
-        if 'Reply-To' in fields:
+        if 'Reply-To' in msg_fields:
             msg['reply'] = decode(msg_txt.get('Reply-To'))
 
-        if 'Date' in fields:
+        if 'Date' in msg_fields:
             date_hdr = decode(msg_txt.get('Date'))
-            msg['date'] = dateutil.parser.parse(date_hdr).strftime("%Y-%m-%d %H:%M:%S")
+            # convert from email timezone to server timezone
+            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+            date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            msg['date'] = date_server_datetime_str
 
-        if 'Content-Transfer-Encoding' in fields:
+        if 'Content-Transfer-Encoding' in msg_fields:
             msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
 
-        if 'References' in fields:
+        if 'References' in msg_fields:
             msg['references'] = msg_txt.get('References')
 
-        if 'In-Reply-To' in fields:
+        if 'In-Reply-To' in msg_fields:
             msg['in-reply-to'] = msg_txt.get('In-Reply-To')
 
         msg['headers'] = {}
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 57a45107f2a..17905e38f53 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -544,7 +544,6 @@ class mail_thread(osv.osv):
             context.update({'thread_model': model})
 
         mail_message = self.pool.get('mail.message')
-        res_id = False
 
         # Parse Message
         # Warning: message_from_string doesn't always work correctly on unicode,
@@ -552,7 +551,7 @@ class mail_thread(osv.osv):
         if isinstance(message, unicode):
             message = message.encode('utf-8')
         msg_txt = email.message_from_string(message)
-        msg = mail_message.parse_message(msg_txt, save_original=save_original)
+        msg = mail_message.parse_message(msg_txt, save_original=save_original, context=context)
 
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']

From 7c597fa28b42fd24a91d4e8d15ad1f2ccd51194c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 16:26:40 +0200
Subject: [PATCH 041/397] [REM] Remove debug data in thread widget.

bzr revid: tde@openerp.com-20120510142640-dqdil3jrtjfrbvky
---
 addons/mail/static/src/xml/mail.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cc423767b81..fe9ea52ae3e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,8 +72,6 @@
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay"/></t>
                 <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay"/></t>
-                <br />Message-id: <t t-esc="record.message_id"/>
-                <br />References: <t t-esc="record.references"/>
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>

From 08c05344fcbd7eaedebbd7ecd47d3441b6e776c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 16:51:17 +0200
Subject: [PATCH 042/397] [REM] Removed Send email buttons that were generic,
 in modules already using OpenChatter. Email buttons still exist in crm
 (fundraising, helpdesk, claim), project (issue, scrum), but those will wait
 for the OpenChatter 2.5 task to land in trunk. hr_evaluation also have Email
 buttons, but those are specific (Reminder buttons).

bzr revid: tde@openerp.com-20120510145117-kg8g5stt4nlp23c8
---
 addons/crm/crm_lead_view.xml                      | 7 -------
 addons/hr_recruitment/hr_recruitment_view.xml     | 1 -
 addons/project_planning/project_planning_view.xml | 1 -
 3 files changed, 9 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a867777cb5b..e98a9ce32a7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -111,9 +111,6 @@
                     <group colspan="2" col="3">
                         <separator string="Communication" colspan="4" col="3"/>
                         <field name="email_from" widget="email"/>
-                        <button string="Mail"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            icon="terp-mail-message-new" type="action" colspan="1"/>
                         <newline/>
                         <field name="phone"/>
                         <newline/>
@@ -461,10 +458,6 @@
                         
                         <group col="3" colspan="2">
                             <field name="email_from" string="Email" />
-                            <button string="Mail"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            context="{'mail':'new', 'model': 'crm.lead'}"
-                            icon="terp-mail-message-new" type="action" />
                         </group>
                             <field name="phone"/>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5d175bd16f5..7a5565d55a9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -91,7 +91,6 @@
                     <group colspan="2" col="4">
                         <field name="partner_name"/>
                         <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
                     </group>
                     <field name="user_id"/>
                     <field name="job_id" on_change="onchange_job(job_id)"/>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5e42c750634..1679f803a73 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -109,7 +109,6 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(mail.action_email_compose_message_wizard)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                     </group>
                                                  </page>
                                                 <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">

From 959551022d16240b9fb18a8bdbedf37fedb9055c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 17:14:45 +0200
Subject: [PATCH 043/397] [FIX] received messages now have 'received' status

bzr revid: tde@openerp.com-20120510151445-22hqlp82dlv11v7p
---
 addons/mail/mail_thread.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 17905e38f53..2a8eddb339e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -553,6 +553,9 @@ class mail_thread(osv.osv):
         msg_txt = email.message_from_string(message)
         msg = mail_message.parse_message(msg_txt, save_original=save_original, context=context)
 
+        # update state
+        msg['state'] = 'received'
+        
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
 

From 2817d119b632cdcc3ca6414019bdf776f98d0a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 17:15:38 +0200
Subject: [PATCH 044/397] [FIX] Thread widget: expander now applied to the
 correct span containing the message, fixing the wall not displaying 'more /
 less' BTW.

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da0ac27e2ff..031e63e275b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -285,13 +285,13 @@ openerp.mail = function(session) {
             // body text manipulation
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
-            this.$element.find('span.oe_mail_msg_body:last').expander({slicePoint: this.params.msg_more_limit, moreClass: 'oe_mail_expand', lesClass: 'oe_mail_reduce'});
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // render
             $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
                     ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-            // truncated: hide full-text, show summary, add buttons
+            // expand feature
+            this.$element.find('span.oe_mail_msg_body:last').expander({slicePoint: this.params.msg_more_limit, moreClass: 'oe_mail_expand', lesClass: 'oe_mail_reduce'});
         },
        
         /**

From 5bb15680490d32d5ec278b0c0a6af7afddcf1e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 12:23:34 +0200
Subject: [PATCH 045/397] [IMP] mail.thread: updated email sending when pushing
 notifications (now in separate method, and a new message is created). Also
 updated get_subscribers API.

bzr revid: tde@openerp.com-20120511102334-050ko2hv8f54uc8b
---
 addons/mail/mail_thread.py | 160 +++++++++++++++++++++++++------------
 1 file changed, 108 insertions(+), 52 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2a8eddb339e..a8844cddbbd 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -80,9 +80,10 @@ class mail_thread(osv.osv):
     
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator"""
-        thread_id = super(mail_thread, self).create(cr, uid, vals, context=context);
-        self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
-        return thread_id;
+        thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
+        if thread_id:
+            self.message_subscribe(cr, uid, [thread_id], [uid], context=context)
+        return thread_id
     
     def write(self, cr, uid, ids, vals, context=None):
         """Automatically subscribe the writer"""
@@ -101,8 +102,6 @@ class mail_thread(osv.osv):
            a foreign key with a 'cascade' ondelete attribute.
            Notifications will be deleted with messages
         """
-        if context is None:
-            context = {}
         subscr_obj = self.pool.get('mail.subscription')
         msg_obj = self.pool.get('mail.message')
         # delete subscriptions
@@ -136,50 +135,31 @@ class mail_thread(osv.osv):
         if vals['user_id']:
             self.message_subscribe(cr, uid, [thread_id], [vals['user_id']], context=context)
         
-        # get users that will get a notification pushed
-        user_to_push_ids = self.message_create_get_notification_user_ids(cr, uid, [thread_id], vals, context=context)
-        user_to_push_from_parse_ids = self.message_parse_users(cr, uid, [thread_id], body, context=context)
-        
-        # set email_from and email_to for comments and notifications
-        if vals.get('type', False) and vals['type'] == 'comment' or vals['type'] == 'notification':
-            current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
-            if not vals.get('email_from', False):
-                vals['email_from'] = current_user.user_email
-            if not vals.get('email_to', False):
-                email_to = ''
-                for user in res_users_obj.browse(cr, uid, user_to_push_ids, context=context):
-                    if not user.notification_email_pref == 'all' and \
-                        not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
-                        continue
-                    if not user.user_email:
-                        continue
-                    email_to = '%s, %s' % (email_to, user.user_email)
-                email_to = email_to.lstrip(', ')
-                if email_to:
-                    vals['email_to'] = email_to
-                    vals['state'] = 'outgoing'
-        
         # create message
         msg_id = message_obj.create(cr, uid, vals, context=context)
         
-        # special: if install mode, do not push demo data
+        # special: if install mode, do not push (demo data: avoid crowdy Wall)
         if context.get('install_mode', False):
-            return True
+            return msg_id
         
-        # push to users
+        # get users that will get a notification pushed
+        user_to_push_ids = self.message_get_user_ids_to_notify(cr, uid, [thread_id], vals, context=context)
         for id in user_to_push_ids:
             notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
         
+        # create the email to send
+        email_id = self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
+        
         return msg_id
     
-    def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None):
+    def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
         subscription_obj = self.pool.get('mail.subscription')
         hide_obj = self.pool.get('mail.subscription.hide')
         # get body
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         
         # get subscribers
-        user_sub_ids = self.message_get_subscribers_ids(cr, uid, thread_ids, context=context)
+        user_sub_ids = self.message_get_subscribers(cr, uid, thread_ids, True, context=context)
         
         # get hiden subscriptions
         subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', thread_ids), ('user_id', 'in', user_sub_ids)], context=context)
@@ -192,7 +172,7 @@ class mail_thread(osv.osv):
             notif_user_ids = user_sub_ids
         
         # add users requested via parsing message (@login)
-        notif_user_ids += self.message_parse_users(cr, uid, thread_ids, body, context=context)
+        notif_user_ids += self.message_parse_users(cr, uid, body, context=context)
         
         # add users requested to perform an action (need_action mechanism)
         if hasattr(self, 'get_needaction_user_ids'):
@@ -211,17 +191,17 @@ class mail_thread(osv.osv):
         notif_user_ids = list(set(notif_user_ids))
         return notif_user_ids
 
-    def message_parse_users(self, cr, uid, ids, string, context=None):
+    def message_parse_users(self, cr, uid, string, context=None):
         """Parse message content
            - if find @login -(^|\s)@((\w|@|\.)*)-: returns the related ids
-             this supports login that are emails (such as @admin@lapin.net)
+             this supports login that are emails (such as @raoul@grobedon.net)
         """
         regex = re.compile('(^|\s)@((\w|@|\.)*)')
         login_lst = [item[1] for item in regex.findall(string)]
         if not login_lst: return []
         user_ids = self.pool.get('res.users').search(cr, uid, [('login', 'in', login_lst)], context=context)
         return user_ids
-
+    
     def message_capable_models(self, cr, uid, context=None):
         ret_dict = {}
         for model_name in self.pool.obj_list():
@@ -805,23 +785,26 @@ class mail_thread(osv.osv):
     # Subscription mechanism
     #------------------------------------------------------
     
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        """ Returns the current document followers. Basically this method
+            checks in mail.subscription for entries with mathing res_model,
+            res_id.
+        
+        :param get_ids: if set to True, return the ids of users; if set
+                        to False, returns the result of a read in res.users
+        """
         subscr_obj = self.pool.get('mail.subscription')
         subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        subs = subscr_obj.read(cr, uid, subscr_ids, context=context)
-        return [sub['user_id'][0] for sub in subs]
-    
-    def message_get_subscribers(self, cr, uid, ids, context=None):
-        user_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context)
-        users = self.pool.get('res.users').read(cr, uid, user_ids, fields=['id', 'name', 'avatar'], context=context)
-        return users
+        user_ids = [sub['user_id'][0] for sub in subscr_obj.read(cr, uid, subscr_ids, ['user_id'], context=context)]
+        if get_ids:
+            return user_ids
+        else:
+            return self.pool.get('res.users').read(cr, uid, user_ids, fields=['id', 'name', 'avatar'], context=context)
     
     def message_is_subscriber(self, cr, uid, ids, user_id = None, context=None):
-        users = self.message_get_subscribers(cr, uid, ids, context=context)
+        subscr_obj = self.pool.get('mail.subscription')
         sub_user_id = uid if user_id is None else user_id
-        if sub_user_id in [user['id'] for user in users]:
-            return True
-        return False
+        return (subscr_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids), ('user_id', '=', sub_user_id)], count=True, context=context) > 0)
     
     def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
         subscription_obj = self.pool.get('mail.subscription')
@@ -834,7 +817,7 @@ class mail_thread(osv.osv):
         return create_ids
 
     def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        if not user_ids and not uid in self.message_get_subscribers_ids(cr, uid, ids, context=context):
+        if not user_ids and not uid in self.message_get_subscribers(cr, uid, ids, True, context=context):
             return False
         subscription_obj = self.pool.get('mail.subscription')
         to_unsubscribe_uids = [uid] if user_ids is None else user_ids
@@ -863,9 +846,82 @@ class mail_thread(osv.osv):
     # Notification API
     #------------------------------------------------------
     
+    def message_create_notify_by_email(self, cr, uid, new_msg_values, user_to_notify_ids, context=None):
+        """ When creating a new message and pushing notifications, emails
+            must be send if users have chosen to receive notifications
+            by email via the notification_email_pref field.
+            
+            ``notification_email_pref`` can have 3 values :
+            - all: receive all notification by email (for example for shared
+              users)
+            - to_me: messages send directly to me (@login, messages on res.users)
+            - never: never receive notifications
+            Note that an user should never receive notifications for messages
+            he has created.
+            
+            :param new_msg_values: dictionary of message values, those that
+                                   are given to the create method
+            :param user_to_notify_ids: list of user_ids, user that will
+                                       receive a notification on their Wall
+        """
+        message_obj = self.pool.get('mail.message')
+        res_users_obj = self.pool.get('res.users')
+        
+        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
+        
+        # remove message writer
+        if user_to_notify_ids.count(new_msg_values.get('user_id')) > 0:
+            user_to_notify_ids.remove(new_msg_values.get('user_id'))
+        
+        # get user_ids directly asked
+        user_to_push_from_parse_ids = self.message_parse_users(cr, uid, body, context=context)
+        
+        email_to = ''
+        
+        # try to find an email_to
+        for user in res_users_obj.browse(cr, uid, user_to_notify_ids, context=context):
+            if not user.notification_email_pref == 'all' and \
+                not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
+                continue
+            if not user.user_email:
+                continue
+            email_to = '%s, %s' % (email_to, user.user_email)
+            email_to = email_to.lstrip(', ')
+        
+        # did not find any email address: not necessary to create an email
+        if not email_to:
+            return
+        
+        # try to find an email_from
+        current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
+        email_from = new_msg_values.get('email_from')
+        if email_from:
+            email_from = current_user.user_email
+        
+        # get email content, create it (with mail_message.create)
+        email_values = self.message_create_notify_get_email_dict(cr, uid, new_msg_values, email_from, email_to, context)
+        print email_values
+        email_id = message_obj.create(cr, uid, email_values, context=context)
+        return email_id
+    
+    def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
+        values = dict(new_msg_values)
+        
+        # get and update body
+        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
+        body += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
+        values.update({
+            'type': 'email',
+            'state': 'outgoing',
+            'email_from': email_from,
+            'email_to': email_to,
+            'subject': 'New message',
+            'content_subtype': 'text',
+        })
+        
+        return values
+    
     def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
-        if context is None:
-            context = {}
         notif_obj = self.pool.get('mail.notification')
         msg_obj = self.pool.get('mail.message')
         if remove_childs:

From a6fd78b0a0d8d2d5e6179f27fcaec656230b05be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 12:37:42 +0200
Subject: [PATCH 046/397] [REM] mail.message: removed display_text field, that
 was used only in Communication History.

bzr revid: tde@openerp.com-20120511103742-xld31z7kic72wvib
---
 addons/mail/mail_message.py | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 80288bd8bda..ae28e0e89bf 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -75,8 +75,9 @@ class mail_message_common(osv.TransientModel):
        emails should inherit from this class and not from mail.message."""
 
     def get_body(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
+        """ get correct body version: body_html for html messages, and
+            body_text for plain text messages
+        """
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
             if message.content_subtype == 'html':
@@ -186,25 +187,6 @@ class mail_message(osv.Model):
                 'nodestroy': True
                 })
         return action_data
-
-    def _get_display_text(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
-        tz = context.get('tz')
-        result = {}
-
-        # Read message as UID 1 to allow viewing author even if from different company
-        for message in self.browse(cr, SUPERUSER_ID, ids):
-            msg_txt = ''
-            if message.email_from:
-                msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.subject)
-                if message.body_text:
-                    msg_txt += truncate_text(message.body_text)
-            else:
-                msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t'
-                msg_txt += (message.subject or '')
-            result[message.id] = msg_txt
-        return result
     
     _columns = {
         'type': fields.selection([
@@ -220,7 +202,6 @@ class mail_message(osv.Model):
         'partner_id': fields.many2one('res.partner', 'Related partner'),
         'user_id': fields.many2one('res.users', 'Related user', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
-        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'state': fields.selection([
                         ('outgoing', 'Outgoing'),

From 4d6412f851486378f96fc500a823d64d36b3956c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 14:40:06 +0200
Subject: [PATCH 047/397] [IMP] mail.thread: sending email for notifications:
 cleaned a bit the code

bzr revid: tde@openerp.com-20120511124006-zf95y0md8803o7bq
---
 addons/mail/mail_thread.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a8844cddbbd..69aba31236f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -125,10 +125,9 @@ class mail_thread(osv.osv):
         """
         if context is None:
             context = {}
+        
         message_obj = self.pool.get('mail.message')
-        subscription_obj = self.pool.get('mail.subscription')
         notification_obj = self.pool.get('mail.notification')
-        res_users_obj = self.pool.get('res.users')
         body = vals.get('body_html', '') if vals.get('content_subtype') == 'html' else vals.get('body_text', '')
         
         # automatically subscribe the writer of the message
@@ -866,7 +865,6 @@ class mail_thread(osv.osv):
         """
         message_obj = self.pool.get('mail.message')
         res_users_obj = self.pool.get('res.users')
-        
         body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
         
         # remove message writer
@@ -876,9 +874,8 @@ class mail_thread(osv.osv):
         # get user_ids directly asked
         user_to_push_from_parse_ids = self.message_parse_users(cr, uid, body, context=context)
         
-        email_to = ''
-        
         # try to find an email_to
+        email_to = ''
         for user in res_users_obj.browse(cr, uid, user_to_notify_ids, context=context):
             if not user.notification_email_pref == 'all' and \
                 not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
@@ -895,19 +892,16 @@ class mail_thread(osv.osv):
         # try to find an email_from
         current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
         email_from = new_msg_values.get('email_from')
-        if email_from:
+        if not email_from:
             email_from = current_user.user_email
         
         # get email content, create it (with mail_message.create)
         email_values = self.message_create_notify_get_email_dict(cr, uid, new_msg_values, email_from, email_to, context)
-        print email_values
         email_id = message_obj.create(cr, uid, email_values, context=context)
         return email_id
     
     def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
         values = dict(new_msg_values)
-        
-        # get and update body
         body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
         body += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
         values.update({
@@ -917,8 +911,10 @@ class mail_thread(osv.osv):
             'email_to': email_to,
             'subject': 'New message',
             'content_subtype': 'text',
+            'auto_delete': True,
+            'res_model': '',
+            'res_id': False,
         })
-        
         return values
     
     def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):

From db6471f7e02bed584e6b00a54f7481f3a543e062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 14:41:19 +0200
Subject: [PATCH 048/397] [IMP] mail.group: propagated get_subscribers_ids
 removal, replaced by gert_subscribers with a get_ids=True

bzr revid: tde@openerp.com-20120511124119-p0hexhu2vcflzaxc
---
 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 0cfc590a996..966bdd2a1c4 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -81,7 +81,7 @@ class mail_group(osv.osv):
         result = dict.fromkeys(ids)
         for id in ids:
             result[id] = {}
-            result[id]['member_ids'] = self.message_get_subscribers_ids(cr, uid, [id], context=context)
+            result[id]['member_ids'] = self.message_get_subscribers(cr, uid, [id], True, context=context)
             result[id]['member_count'] = len(result[id]['member_ids'])
             result[id]['is_subscriber'] = uid in result[id]['member_ids']
         return result

From 35b0b58b3ed3f6b9791f8e2d4770dc682abcc40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 14:41:39 +0200
Subject: [PATCH 049/397] [REF] mail.thread API: get_subscribers: propagated
 chances (in crm_lead, hr_holidays, hr_recruitment, mrp, project,
 project_issue)

bzr revid: tde@openerp.com-20120511124139-paj05zp4lw6bvcr6
---
 addons/crm/crm_lead.py                  | 11 +++++------
 addons/hr_holidays/hr_holidays.py       | 15 ++++++++-------
 addons/hr_recruitment/hr_recruitment.py | 12 ++++++------
 addons/mrp/mrp.py                       | 10 +++++-----
 addons/project/project.py               | 24 ++++++++++++------------
 addons/project_issue/project_issue.py   | 14 +++++++-------
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 99bda3ec740..2811703c648 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -829,13 +829,12 @@ class crm_lead(crm_case, osv.osv):
     # OpenChatter methods and notifications
     # ----------------------------------------
 
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(crm_lead, self).message_get_subscribers_ids(cr, uid, ids, context=context)
-        # add salesman to the subscribers
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(crm_lead, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+        return super(crm_lead, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
     
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index dd5544789c5..98c71dc731b 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -371,14 +371,15 @@ class hr_holidays(osv.osv):
                     hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0]
                     result[obj.id] = hr_manager_group['users']
         return result
-    
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(hr_holidays, self).message_get_subscribers_ids(cr, uid, ids, context=context)
-        # add the employee and its manager if specified to the subscribed users
+
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(hr_holidays, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.employee_id.parent_id:
-                sub_ids.append(obj.employee_id.parent_id.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+            if obj.employee_id.parent_id and not obj.employee_id.parent_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.employee_id.parent_id.id], context=context)
+        return super(hr_holidays, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
         
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 1ad2d92e564..507421773ac 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -483,13 +483,13 @@ class hr_applicant(crm.crm_case, osv.osv):
     # -------------------------------------------------------
     # OpenChatter methods and notifications
     # -------------------------------------------------------
-    
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(hr_applicant, self).message_get_subscribers_ids(cr, uid, ids, context=context)
+
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(hr_applicant, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+        return super(hr_applicant, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
 
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
         result = dict.fromkeys(ids, [])
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f5192aa8428..aaa11a21fc5 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1041,12 +1041,12 @@ class mrp_production(osv.osv):
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(mrp_production, self).message_get_subscribers_ids(cr, uid, ids, context=context)
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(mrp_production, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+        return super(mrp_production, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
diff --git a/addons/project/project.py b/addons/project/project.py
index c4313308106..78832276276 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -471,12 +471,12 @@ def Project():
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(project, self).message_get_subscribers_ids(cr, uid, ids, context=context);
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(project, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+        return super(project, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project, self).create(cr, uid, vals, context=context)
@@ -1154,14 +1154,14 @@ class task(osv.osv):
                 result[obj.id] = [obj.user_id.id]
         return result
 
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(task, self).message_get_subscribers_ids(cr, uid, ids, context=context)
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(task, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-            if obj.manager_id:
-                sub_ids.append(obj.manager_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+            if obj.manager_id and not obj.manager_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.manager_id.id], context=context)
+        return super(task, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index cc8f8b7d091..5492366df7b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -475,19 +475,19 @@ class project_issue(crm.crm_case, osv.osv):
             if obj.state == 'draft' and obj.user_id:
                 result[obj.id] = [obj.user_id.id]
         return result
-    
-    def message_get_subscribers_ids(self, cr, uid, ids, context=None):
-        sub_ids = super(project_issue, self).message_get_subscribers_ids(cr, uid, ids, context=context)
+
+    def message_get_subscribers(self, cr, uid, ids, get_ids=False, context=None):
+        user_ids = super(project_issue, self).message_get_subscribers(cr, uid, ids, True, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return sub_ids
+            if obj.user_id and not obj.user_id.id in user_ids:
+                self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+        return super(project_issue, self).message_get_subscribers(cr, uid, ids, get_ids, context=context)
     
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         return 'Project issue '
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>converted</b> in to task.")
+        message = _("Project issue has been <b>converted</b> into task.")
         return self.message_append_note(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):

From c4b38f48582e2679ad1cc011508c8eab9705aa5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 14:49:27 +0200
Subject: [PATCH 050/397] [FIX] mail: res.users: forgot to resolve a conflict.

bzr revid: tde@openerp.com-20120511124927-ox8egxt216w9j4i7
---
 addons/mail/res_users.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 9a61001c922..f52dd50c024 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -33,16 +33,12 @@ class res_users(osv.osv):
     _columns = {
         'notification_email_pref': fields.selection([
                         ('all', 'All feeds'),
-                        ('to_me', 'Only sent directly to me'),
+                        ('comments', 'Only comments'),
+                        ('to_me', 'Only when sent directly to me'),
                         ('none', 'Never')
-<<<<<<< TREE
-                        ], 'Receive feeds by email', required=True,
-                        help="Choose in which case you want to receive \
-                              an email when you receive new feeds."),
-=======
                         ], 'Receive Feeds by E-mail', required=True,
-                        help="Choose in which case you want to receive an email when you receive new feeds."),
->>>>>>> MERGE-SOURCE
+                        help="Choose in which case you want to receive an \
+                              email when you receive new feeds."),
     }
     
     _defaults = {

From 4232d142a2d1f145286f44722400eb6ac5998d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 14:58:30 +0200
Subject: [PATCH 051/397] [IMP] mail_thread: notification email sending: fixed
 and cleaned body of email. Will need an upgrade of style, but the mechanism
 is basically there.

bzr revid: tde@openerp.com-20120511125830-bjucro0f7p3pumtv
---
 addons/mail/mail_thread.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 69aba31236f..de3cc1d38b8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -902,15 +902,22 @@ class mail_thread(osv.osv):
     
     def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
         values = dict(new_msg_values)
-        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
-        body += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
+        
+        body_html = new_msg_values.get('body_html', '')
+        if body_html:
+            body_html += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
+        body_text = new_msg_values.get('body_text', '')
+        if body_text:
+            body_text += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
         values.update({
             'type': 'email',
             'state': 'outgoing',
             'email_from': email_from,
             'email_to': email_to,
             'subject': 'New message',
-            'content_subtype': 'text',
+            'content_subtype': new_msg_values.get('content_subtype', 'plain'),
+            'body_html': body_html,
+            'body_text': body_text,
             'auto_delete': True,
             'res_model': '',
             'res_id': False,

From 4ffaecb6274b6eb29d021c76f70ad8b29c17ded3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 11 May 2012 15:01:07 +0200
Subject: [PATCH 052/397] [IMP] mail.message form view: Open document button
 not visible if model or res_id not defined.

bzr revid: tde@openerp.com-20120511130107-qwtg7v123h5kugg3
---
 addons/mail/mail_message_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 871303ce00e..18096a3c543 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -97,7 +97,8 @@
                             <group col="4" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
                                 <field name="model"/>
-                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
+                                    attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
                                 <field name="res_id"/>
                             </group>
                             <notebook colspan="4">

From f4b727dfdc9085fea1c981268953f571fa66756c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 11:40:02 +0200
Subject: [PATCH 053/397] [IMP] Thread widget: action menu is displayed when
 hovering the whell

bzr revid: tde@openerp.com-20120514094002-f1kd8pth5jd1qlxr
---
 addons/mail/static/src/css/mail.css | 4 ++++
 addons/mail/static/src/js/mail.js   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a912570c3de..cb7a1c9865b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -261,6 +261,10 @@
     -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
 
+.openerp img.oe_mail_msg_menu_icon:hover + .openerp ul.oe_mail_msg_menu {
+    display: block;
+}
+
 /* ------------------------------ */
 /* Styling (should be openerp)    */
 /* ------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 031e63e275b..94f9e0c46c9 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -140,10 +140,6 @@ openerp.mail = function(session) {
                 });
                 return false;
             });
-            // event: click on the wheel menu in messages
-            this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) {
-                self.$element.find('ul.oe_mail_msg_menu').toggle();
-            });
             // event: click on 'hide' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_thread', 'click', function (event) {
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }

From be0d26923df1d1e563592ac5d03a42a65dbc1f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 12:08:20 +0200
Subject: [PATCH 054/397] [IMP] Thread widget: reply by e-mail not shown on
 Wall; renamed wall widget parameter to is_wall.

bzr revid: tde@openerp.com-20120514100820-9m4jua07sydjakey
---
 addons/mail/static/src/css/mail.css | 71 ++++++++++++++++-------------
 addons/mail/static/src/js/mail.js   | 13 +++---
 addons/mail/static/src/xml/mail.xml |  5 +-
 3 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index cb7a1c9865b..0576ba59f84 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -129,6 +129,7 @@
 /* ------------------------------ */
 
 .openerp div.oe_mail_thread_act {
+	display: none;
     white-space: normal;
     margin-bottom: 5px;
     padding: 4px;
@@ -149,6 +150,10 @@
     padding-left: 5%;
 }
 
+.openerp a.oe_mail_compose {
+	display: none;
+}
+
 .openerp div.oe_mail_thread_more {
     display: none;
     border-bottom: 1px solid #D2D9E7;
@@ -170,6 +175,41 @@
     clear: both; 
 }
 
+.openerp img.oe_mail_msg_menu_icon {
+    float: right;
+    cursor: pointer;
+}
+
+.openerp ul.oe_mail_msg_menu {
+    display: none;
+    position: absolute;
+    top: 0.5em;
+    right: 1em;
+    overflow-x: hidden;
+    z-index: 900;
+    background: white;
+    padding: 4px;
+    border: 1px solid #AFAFB6;
+    width: 150px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+}
+
+.openerp img.oe_mail_msg_menu_icon:hover + ul.oe_mail_msg_menu {
+    display: block;
+}
+
+.openerp ul.oe_mail_msg_menu:hover {
+	display: block;
+}
+
 .openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
     position: relative;
     padding: 4px;
@@ -234,37 +274,6 @@
     color: #4E43E7;
 }
 
-.openerp img.oe_mail_msg_menu_icon {
-    float: right;
-    cursor: pointer;
-}
-
-.openerp ul.oe_mail_msg_menu {
-    display: none;
-    position: absolute;
-    top: 1em;
-    right: 1em;
-    overflow-x: hidden;
-    z-index: 900;
-    background: white;
-    padding: 4px;
-    border: 1px solid #AFAFB6;
-    width: 150px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-}
-
-.openerp img.oe_mail_msg_menu_icon:hover + .openerp ul.oe_mail_msg_menu {
-    display: block;
-}
-
 /* ------------------------------ */
 /* Styling (should be openerp)    */
 /* ------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 94f9e0c46c9..c4795c09c40 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -44,7 +44,7 @@ openerp.mail = function(session) {
             this.params = params;
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
-            this.params.wall = this.params.wall || this.params.records || false;
+            this.params.is_wall = this.params.is_wall || this.params.records || false;
             this.params.msg_more_limit = this.params.msg_more_limit || 150;
             this.params.limit = this.params.limit || 100;
             this.params.offset = this.params.offset || 0;
@@ -58,11 +58,11 @@ openerp.mail = function(session) {
             // display customization vars
             this.display = {};
             this.display.show_post_comment = this.params.show_post_comment || false;
-            this.display.show_msg_menu = this.params.wall;
+            this.display.show_msg_menu = this.params.is_wall;
             this.display.show_reply = (this.params.thread_level > 0);
-            this.display.show_delete = ! this.params.wall;
-            this.display.show_hide = this.params.wall;
-            this.display.show_reply_by_email = ! this.params.wall;
+            this.display.show_delete = ! this.params.is_wall;
+            this.display.show_hide = this.params.is_wall;
+            this.display.show_reply_by_email = ! this.params.is_wall;
             this.display.show_more = (this.params.thread_level == 0);
             // internal links mapping
             this.intlinks_mapping = {};
@@ -71,7 +71,8 @@ openerp.mail = function(session) {
         start: function() {
             this._super.apply(this, arguments);
             // customize display
-            if (! this.display.show_post_comment) this.$element.find('div.oe_mail_thread_act').hide();
+            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').show(); }
+            if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
             // add events
             this.add_events();
             /* display user, fetch comments */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index fe9ea52ae3e..dc80ccc06fe 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -49,10 +49,9 @@
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
-            <p><a href="#" class="oe_mail_compose oe_mail_oe_right">
-                Send an e-mail
+            <a href="#" class="oe_mail_compose oe_mail_oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
-            </a></p>
+            </a>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">

From a4579ac6e7323d789a1c6459bf40b7f23714274a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 14:14:49 +0200
Subject: [PATCH 055/397] [FIX] Fixed hiden subscription check that was wrong.

bzr revid: tde@openerp.com-20120514121449-juu3m1xzuypnftiq
---
 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 de3cc1d38b8..25453c7b5e5 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -164,8 +164,8 @@ class mail_thread(osv.osv):
         subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', thread_ids), ('user_id', 'in', user_sub_ids)], context=context)
         hide_ids = hide_obj.search(cr, uid, [('subscription_id', 'in', subscription_ids), ('subtype', '=', new_msg_vals.get('subtype'))], context=context)
         if hide_ids:
-            hiden_subscription_ids = map(itemgetter('subscription_id'), hide_obj.read(cr, uid, hide_ids, ['subscription_id'], context=context))
-            hiden_user_ids = map(itemgetter('user_id'), subscription_obj.read(cr, uid, hiden_subscription_ids, ['user_id'], context=context))
+            hiden_subscriptions = hide_obj.browse(cr, uid, hide_ids, context=context)
+            hiden_user_ids = [hiden_subscription.subscription_id.user_id.id for hiden_subscription in hiden_subscriptions]
             notif_user_ids = [user_id for user_id in user_sub_ids if not user_id in hiden_user_ids]
         else:
             notif_user_ids = user_sub_ids

From 42c41a7ee45ed6922c91b83179e9fa436eba897c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 14:15:30 +0200
Subject: [PATCH 056/397] [IMP] Thread widget: updated actions menu in messages

bzr revid: tde@openerp.com-20120514121530-hrnixf8h95h7ynak
---
 addons/mail/static/src/js/mail.js   | 12 ------------
 addons/mail/static/src/xml/mail.xml | 10 +++++++---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c4795c09c40..1f7c2f69d1a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -141,18 +141,6 @@ openerp.mail = function(session) {
                 });
                 return false;
             });
-            // event: click on 'hide' in wheel_menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_thread', 'click', function (event) {
-                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
-                }
-                return false;
-            });
             // event: click on 'hide this type' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
                 console.log('hiding type');
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index dc80ccc06fe..eccf9a6de87 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -63,9 +63,13 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <li><a href="#" class="oe_mail_msg_hide_thread" t-attf-data-id='{record.id}'>Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/>
-                </a></li>
+                <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                </t></t>
+                <t t-if="display['show_hide']">
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/></a></li>
+                </t>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">

From 2522af3dca369bf55b88f481af53a18c9aa70a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 14:32:31 +0200
Subject: [PATCH 057/397] [IMP] Thread widget: action menu appears only in
 Wall.

bzr revid: tde@openerp.com-20120514123231-45rqs796tej9p60i
---
 addons/mail/static/src/js/mail.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1f7c2f69d1a..a8dae21381b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -70,18 +70,23 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-            // customize display
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').show(); }
-            if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
             // add events
             this.add_events();
             /* display user, fetch comments */
             this.display_current_user();
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
             else var display_done = this.init_comments();
+            // customize display
+            $.when(display_done).then(this.proxy('do_customize_display'));
             return display_done
         },
         
+        do_customize_display: function() {
+            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').show(); }
+            if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
+            if (! this.display.show_msg_menu) { this.$element.find('img.oe_mail_msg_menu_icon').hide(); }
+        },
+        
         add_events: function() {
             var self = this;
             // event: click on 'more' at bottom of thread

From 9dc755d246a27f31a36f6050fef0ece2b26cd0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:40:13 +0200
Subject: [PATCH 058/397] [REM] Removed unused function.

bzr revid: tde@openerp.com-20120514144013-7yxyhlnm3g3o7deg
---
 addons/mail/static/src/js/mail.js | 45 -------------------------------
 1 file changed, 45 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a8dae21381b..1015a22785c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -283,51 +283,6 @@ openerp.mail = function(session) {
             // expand feature
             this.$element.find('span.oe_mail_msg_body:last').expander({slicePoint: this.params.msg_more_limit, moreClass: 'oe_mail_expand', lesClass: 'oe_mail_reduce'});
         },
-       
-        /**
-         * Add records to sorted_comments array
-         * @param {Array} records records from mail.message sorted by date desc
-         * @returns {Object} sc sorted_comments: dict {
-         *                          'root_id_list': list or root_ids
-         *                          'root_id_msg_list': {'record_id': [ancestor_ids]}, still sorted by date desc
-         *                          'id_to_root': {'root_id': [records]}, still sorted by date desc
-         *                          }
-         */
-        sort_comments: function (records) {
-            var self = this;
-            sc = {'root_id_list': [], 'root_id_msg_list': {}, 'id_to_root': {}}
-            var cur_iter = 0; var max_iter = 10; var modif = true;
-            /* step1: get roots */
-            while ( modif && (cur_iter++) < max_iter) {
-                modif = false;
-                _(records).each(function (record) {
-                    if ( (record.parent_id == false || record.parent_id[0] == self.params.parent_id) && (_.indexOf(sc['root_id_list'], record.id) == -1)) {
-                        sc['root_id_list'].push(record.id);
-                        sc['root_id_msg_list'][record.id] = [];
-                        self.sorted_comments['root_ids'].push(record.id);
-                        modif = true;
-                    } 
-                    else {
-                        if (_.indexOf(sc['root_id_list'], record.parent_id[0]) != -1) {
-                             sc['id_to_root'][record.id] = record.parent_id[0];
-                             modif = true;
-                        }
-                        else if ( sc['id_to_root'][record.parent_id[0]] ) {
-                             sc['id_to_root'][record.id] = sc['id_to_root'][record.parent_id[0]];
-                             modif = true;
-                        }
-                    }
-                });
-            }
-            /* step2: add records */
-            _(records).each(function (record) {
-                var root_id = sc['id_to_root'][record.id];
-                if (! root_id) return;
-                sc['root_id_msg_list'][root_id].push(record);
-                //self.sorted_comments['root_id_msg_list'][root_id].push(record.id);
-            });
-            return sc;
-        },
         
         /**
          * Add records to comments_structure object: see function for details

From a99837b6adc8f2c9fa6c4bf849e120db0955e305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:47:39 +0200
Subject: [PATCH 059/397] [REF] Thread widget code: moved some functions

bzr revid: tde@openerp.com-20120514144739-r9hxld9b108rym1e
---
 addons/mail/static/src/js/mail.js   | 66 +++++++++++++++++------------
 addons/mail/static/src/xml/mail.xml |  2 +-
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1015a22785c..ddfa258e677 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -306,7 +306,7 @@ openerp.mail = function(session) {
         /**
          * Create a domain to fetch new comments according to
          * comment already present in sorted_comments
-         * @param {Object} sorted_comments (see sort_comments)
+         * @param {Object} sorted_comments (see tools_sort_comments)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
         get_fetch_domain: function (sorted_comments) {
@@ -338,9 +338,13 @@ openerp.mail = function(session) {
             domain = this.get_fetch_domain(this.sorted_comments);
             return this.fetch_comments(this.params.limit, this.params.offset, domain);
         },
+
+
+        /**
+         *    CONTENT MANIPULATION
+         */
         
         /**
-         *
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
          * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
          */
@@ -367,8 +371,31 @@ openerp.mail = function(session) {
             return string;
         },
         
-        thread_get_avatar: function(model, field, id) {
-            return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        /**
+         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+         */
+        do_check_for_internal_links: function(string) {
+            /* shortcut to user: @login */
+            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+            var regex_res = regex_login.exec(string);
+            while (regex_res != null) {
+                var login = regex_res[2];
+                if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
+                this.map_hash['res.users']['login'].push(login);
+                regex_res = regex_login.exec(string);
+            }
+            /* document link with name_get: [res.model,name] */
+            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
+            var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+            regex_res = regex_intlink.exec(string);
+            while (regex_res != null) {
+                var res_model = regex_res[2] + '.' + regex_res[3];
+                var res_name = regex_res[4];
+                if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
+                this.map_hash[res_model]['name'].push(res_name);
+                regex_res = regex_intlink.exec(string);
+            }
         },
         
         do_clean_text: function (string) {
@@ -380,32 +407,15 @@ openerp.mail = function(session) {
             var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
             return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
         },
-        
+
+
         /**
-         *
-         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+         *    MISC TOOLS METHODS
          */
-        do_check_internal_links: function(string) {
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
-                this.map_hash['res.users']['login'].push(login);
-                regex_res = regex_login.exec(string);
-            }
-            /* internal links: #res.model,name */
-            var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-            regex_res = regex_intlink.exec(string);
-            while (regex_res != null) {
-                var res_model = regex_res[2] + '.' + regex_res[3];
-                var res_name = regex_res[4];
-                if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
-                this.map_hash[res_model]['name'].push(res_name);
-                regex_res = regex_intlink.exec(string);
-            }
+        
+        /** get an image in /web/binary/image?... */
+        thread_get_avatar: function(model, field, id) {
+            return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
         
         /** checks if tue current user is the message author */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index eccf9a6de87..b8adba6d01a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
                 </t></t>
                 <t t-if="display['show_hide']">
                     <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/></a></li>
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>

From 52927bd292241a875a520003860c716b30a072bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:49:27 +0200
Subject: [PATCH 060/397] [REF] Thread widget: thread_get_avatar renamed in
 _get_image, because it is a function to fetch an image in openerp web client

bzr revid: tde@openerp.com-20120514144927-psywffp2td5wdl62
---
 addons/mail/static/src/js/mail.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ddfa258e677..f9e97010978 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -271,7 +271,7 @@ openerp.mail = function(session) {
         display_comment: function (record) {
             record.body = this.do_text_nl2br(record.body, true);
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }    
+            else { record.mini_url = this._get_image('res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
@@ -292,7 +292,7 @@ openerp.mail = function(session) {
         },
         
         display_current_user: function () {
-            return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.params.uid));
+            return this.$element.find('img.oe_mail_msg_image').attr('src', this._get_image('res.users', 'avatar', this.params.uid));
         },
         
         do_comment: function () {
@@ -414,7 +414,7 @@ openerp.mail = function(session) {
          */
         
         /** get an image in /web/binary/image?... */
-        thread_get_avatar: function(model, field, id) {
+        _get_image: function(model, field, id) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
         
@@ -501,7 +501,7 @@ openerp.mail = function(session) {
             $('<h4/>').html('Followers (' + records.length + ')').appendTo(sub_node);
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
-                var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
+                var mini_url = self._get_image('res.users', 'avatar', record.id);
                 $('<img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '" title="' + record.name + '" alt="' + record.name + '"/>').appendTo(sub_node);
             });
             if (self.is_subscriber) {
@@ -530,7 +530,7 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
         
-        thread_get_avatar: function(model, field, id) {
+        _get_image: function(model, field, id) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
     });

From 123740e9f7243601824304b37f71bafad8205d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:53:59 +0200
Subject: [PATCH 061/397] [REF] _get_image out of widgets and become
 tools_get_image, because it was defined twice for the same behavior.

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f9e97010978..2e1b5605400 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -271,7 +271,7 @@ openerp.mail = function(session) {
         display_comment: function (record) {
             record.body = this.do_text_nl2br(record.body, true);
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = this._get_image('res.users', 'avatar', record.user_id[0]); }    
+            else { record.mini_url = tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
             record.body = this.do_clean_text(record.body);
             record.body = this.do_replace_internal_links(record.body);
@@ -292,7 +292,7 @@ openerp.mail = function(session) {
         },
         
         display_current_user: function () {
-            return this.$element.find('img.oe_mail_msg_image').attr('src', this._get_image('res.users', 'avatar', this.params.uid));
+            return this.$element.find('img.oe_mail_msg_image').attr('src', tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
         },
         
         do_comment: function () {
@@ -413,11 +413,6 @@ openerp.mail = function(session) {
          *    MISC TOOLS METHODS
          */
         
-        /** get an image in /web/binary/image?... */
-        _get_image: function(model, field, id) {
-            return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
-        },
-        
         /** checks if tue current user is the message author */
         _is_author: function (id) {
             return (this.session.uid == id);
@@ -501,7 +496,7 @@ openerp.mail = function(session) {
             $('<h4/>').html('Followers (' + records.length + ')').appendTo(sub_node);
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
-                var mini_url = self._get_image('res.users', 'avatar', record.id);
+                var mini_url = tools_get_image(self.session.prefix, self.session.session_id, 'res.users', 'avatar', record.id);
                 $('<img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '" title="' + record.name + '" alt="' + record.name + '"/>').appendTo(sub_node);
             });
             if (self.is_subscriber) {
@@ -529,10 +524,6 @@ openerp.mail = function(session) {
             else { this.$element.find('button.oe_mail_button_followers').html('Display followers'); }
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
-        
-        _get_image: function(model, field, id) {
-            return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
-        },
     });
     
     
@@ -795,6 +786,12 @@ openerp.mail = function(session) {
         }
         return cs;
     }
+
+    /** get an image in /web/binary/image?... */
+    function tools_get_image(session_prefix, session_id, model, field, id) {
+        return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+    }
+        
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From a20fabb69ed1bea2a34e2843322095904103ee13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:55:05 +0200
Subject: [PATCH 062/397] [REM] Thread widget: removed some console.log

bzr revid: tde@openerp.com-20120514145505-8rd725ctc182trx2
---
 addons/mail/static/src/js/mail.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2e1b5605400..2219804b7c3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -131,7 +131,6 @@ openerp.mail = function(session) {
             });
             // event: click on "reply by email" in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
-                console.log('reply by e-mail');
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 self.do_action({
@@ -148,7 +147,6 @@ openerp.mail = function(session) {
             });
             // event: click on 'hide this type' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
-                console.log('hiding type');
                 if (! confirm(_t("Do you really want to hide this type of thread ?"))) { return false; }
                 var subtype = event.srcElement.dataset.subtype;
                 if (! subtype) return false;

From 3384d341e632553a578b2dadc7a1e50f02bd4c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 17:20:18 +0200
Subject: [PATCH 063/397] [REM] Thread widget: removed references to
 sorted_comments variable

bzr revid: tde@openerp.com-20120514152018-6uzht6dv0ip6tc0u
---
 addons/mail/static/src/js/mail.js | 43 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2219804b7c3..4142efed1bb 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -53,7 +53,6 @@ openerp.mail = function(session) {
             this.ds = new session.web.DataSet(this, this.params.res_model);
             this.ds_users = new session.web.DataSet(this, 'res.users');
             this.ds_msg = new session.web.DataSet(this, 'mail.message');
-            this.sorted_comments = {'root_ids': [], 'root_id_msg_list': {}};
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             // display customization vars
             this.display = {};
@@ -200,21 +199,20 @@ openerp.mail = function(session) {
         init_comments: function() {
             var self = this;
             this.params.offset = 0;
-            this.sorted_comments = {'root_ids': [], 'root_id_msg_list': {}};
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.$element.find('div.oe_mail_thread_display').empty();
-            domain = this.get_fetch_domain(this.sorted_comments);
+            var domain = this.get_fetch_domain(this.comments_structure);
             return this.fetch_comments(this.params.limit, this.params.offset, domain).then();
         },
         
         fetch_comments: function (limit, offset, domain) {
             var self = this;
-            var defer = this.ds.call('message_load', [[this.params.res_id], (this.params.thread_level > 0), (this.sorted_comments['root_ids']),
-                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]);
-            $.when(defer).then(function (records) {
+            var defer = this.ds.call('message_load', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']),
+                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
                 self.display_comments(records);
+                // TODO: move to customize display
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                 else  self.$element.find('div.oe_mail_thread_more:last').hide();
                 });
@@ -225,6 +223,7 @@ openerp.mail = function(session) {
             if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
             else this.display.show_more = false;
             var defer = this.display_comments(records);
+            // TODO: move to customize display
             if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
             else $('div.oe_mail_thread_more').eq(-2).hide();
             return defer;
@@ -232,7 +231,7 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            this.cs = this.sort_comments_tmp(records);
+            tools_sort_comments(this.comments_structure, records, this.params.parent_id);
             
             /* WIP: map matched regexp -> records to browse with name */
             //_(records).each(function (record) {
@@ -242,7 +241,7 @@ openerp.mail = function(session) {
             _(records).each(function (record) {
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
-                    var sub_list = self.cs['tree_struct'][record.id]['direct_childs'];
+                    var sub_list = this.comments_structure['tree_struct'][record.id]['direct_childs'];
                     _(records).each(function (record) {
                         //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
                         if (_.indexOf(sub_list, record.id) != -1) {
@@ -282,13 +281,6 @@ openerp.mail = function(session) {
             this.$element.find('span.oe_mail_msg_body:last').expander({slicePoint: this.params.msg_more_limit, moreClass: 'oe_mail_expand', lesClass: 'oe_mail_reduce'});
         },
         
-        /**
-         * Add records to comments_structure object: see function for details
-         */
-        sort_comments_tmp: function(records) {
-            return tools_sort_comments(this.comments_structure, records, this.params.parent_id);
-        },
-        
         display_current_user: function () {
             return this.$element.find('img.oe_mail_msg_image').attr('src', tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
         },
@@ -303,17 +295,17 @@ openerp.mail = function(session) {
         
         /**
          * Create a domain to fetch new comments according to
-         * comment already present in sorted_comments
-         * @param {Object} sorted_comments (see tools_sort_comments)
+         * comment already present in comments_structure
+         * @param {Object} comments_structure (see tools_sort_comments)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
-        get_fetch_domain: function (sorted_comments) {
+        get_fetch_domain: function (comments_structure) {
             var domain = [];
-            var ids = sorted_comments.root_ids.slice();
+            var ids = comments_structure.root_ids.slice();
             var ids2 = [];
             // must be child of current parent
             if (this.params.parent_id) { domain.push(['id', 'child_of', this.params.parent_id]); }
-            _(sorted_comments.root_ids).each(function (id) { // each record
+            _(comments_structure.root_ids).each(function (id) { // each record
                 ids.push(id);
                 ids2.push(id);
             });
@@ -333,7 +325,7 @@ openerp.mail = function(session) {
         },
         
         do_more: function () {
-            domain = this.get_fetch_domain(this.sorted_comments);
+            domain = this.get_fetch_domain(this.comments_structure);
             return this.fetch_comments(this.params.limit, this.params.offset, domain);
         },
 
@@ -537,9 +529,7 @@ openerp.mail = function(session) {
          * @param {Object} [params]
          * @param {Number} [params.limit=20] number of messages to show and fetch
          * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} sorted_comments records sorted by res_model and res_id
-         *                  records.res_model = {res_ids}
-         *                  records.res_model.res_id = [records]
+         * @var {Array} comments_structure see tools_sort_comments
          */
         init: function (parent, params) {
             this._super(parent);
@@ -689,10 +679,9 @@ openerp.mail = function(session) {
 
         /**
          * Create a domain to fetch new comments according to
-         * comments already present in sorted_comments
+         * comments already present in comments_structure
          * - for each model:
          * -- should not be child of already displayed ids
-         * @param {Object} sorted_comments (see sort_comments)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
         get_fetch_domain: function () {
@@ -733,7 +722,7 @@ openerp.mail = function(session) {
      */
 
     /**
-    * Add records to sorted_comments array
+    * Add records to comments_structure array
     * @param {Array} records records from mail.message sorted by date desc
     * @returns {Object} cs comments_structure: dict
     *                      cs.model_to_root_ids = {model: [root_ids], }

From a6c455e5ab93b8f62da41336e1b5d999c38e39aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 09:27:03 +0200
Subject: [PATCH 064/397] [FIX] Thread widget: fixed this->self

bzr revid: tde@openerp.com-20120515072703-0vnb3m0p8p31ly7q
---
 addons/mail/static/src/js/mail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4142efed1bb..36352a9a999 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -71,7 +71,7 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             // add events
             this.add_events();
-            /* display user, fetch comments */
+            // display user, fetch comments
             this.display_current_user();
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
             else var display_done = this.init_comments();
@@ -241,7 +241,7 @@ openerp.mail = function(session) {
             _(records).each(function (record) {
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
-                    var sub_list = this.comments_structure['tree_struct'][record.id]['direct_childs'];
+                    var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
                     _(records).each(function (record) {
                         //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
                         if (_.indexOf(sub_list, record.id) != -1) {

From 0571d171f8ed8cfd7072f37324f4d23fa7cbd0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 13:07:02 +0200
Subject: [PATCH 065/397] [IMP] RecordThread widget: now handles options.

bzr revid: tde@openerp.com-20120515110702-x1u3kic6c16smpks
---
 addons/mail/static/src/js/mail.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d9d79832c61..aed36935906 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -420,10 +420,12 @@ openerp.mail = function(session) {
         // QWeb template to use when rendering the object
         template: 'RecordThread',
 
-        init: function() {
+       init: function() {
             this._super.apply(this, arguments);
             this.see_subscribers = true;
             this.thread = null;
+            this.params = this.get_definition_options();
+            this.params.thread_level = this.params.thread_level || 0;
             // datasets
             this.ds = new session.web.DataSet(this, this.view.model);
             this.ds_users = new session.web.DataSet(this, 'res.users');
@@ -464,12 +466,8 @@ openerp.mail = function(session) {
             // create and render Thread widget
             this.$element.find('div.oe_mail_recthread_left').empty();
             if (this.thread) this.thread.destroy();
-            // hack: for groups and users
-            if (this.view.model == 'mail.group') thread_level = 1;
-            if (this.view.model == 'res.users') thread_level = 1;
-            else thread_level = 0;
             this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
-                                                    'thread_level': thread_level, 'show_post_comment': true, 'limit': 15});
+                                                    'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
             var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_left'));
             return fetch_sub_done && thread_done;
         },

From 2a42c7bf675b4f997250a4588aa67d5e213f4f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 13:49:58 +0200
Subject: [PATCH 066/397] [IMP] mail.group: improved form view.

bzr revid: tde@openerp.com-20120515114958-lqjmlics4wwnf794
---
 addons/mail/mail_group_view.xml           | 48 +++++++++++------------
 addons/mail/static/src/css/mail_group.css | 15 ++++---
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 886f3cfaac1..7babfbe877d 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -50,41 +50,41 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group">
-                    <group colspan="4" col="8">
-                        <group colspan="6" col="4">
-                            <separator string="General Information" colspan="4"/>
-                            <field name="name" colspan="2"/>
-                            <field name="responsible_id" colspan="2"/>
-                            <newline/>
-                            <field name="description" colspan="4"/>
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Group Image" colspan="2"/>
+                <form string="Group Form" layout="manual">
+                    <sheet layout="auto">
+                        <group colspan="1">
                             <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                         </group>
-                        <group colspan="1" col="2">
-                            <separator string="Privacy Settings" colspan="2"/>
-                            <field name="public" nolabel="1"/>
-                            <label string="This group is visible by non members" colspan="2"/>
+                        <group colspan="3" col="6">
+                            <h2><field name="name" nolabel="1" colspan="4"/></h2>
+                            <newline/>
+                            <group colspan="2" col="2">
+                                <field name="responsible_id" colspan="2"/>
+                                <label string="Visible by non members" colspan="1"/>
+                                <field name="public" nolabel="1"/>
+                                <field name="push_to_groups" colspan="2"/>
+                            </group>
+                            <group colspan="4" col="4">
+                                <field name="description" colspan="4" nolabel="1"/>
+                            </group>
                         </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Links">
-                            <field name="models" colspan="4">
+                        <group colspan="4" col="6">
+                            <field name="models" colspan="3">
                                 <tree string="Document models">
                                     <field name="name"/>
                                 </tree>
                             </field>
-                            <field name="groups" colspan="4">
+                            <field name="groups" colspan="3">
                                 <tree string="Document groups">
                                     <field name="name"/>
                                 </tree>
                             </field>
-                            <field name="push_to_groups"/>
-                        </page>
-                    </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                        </group>
+                    </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"
+                                options='{"thread_level": 1}'/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 90261499753..a7be31e4801 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -1,3 +1,12 @@
+/* ------------------------------ */
+/* Group Form                     */
+/* ------------------------------ */
+
+
+/* ------------------------------ */
+/* Group Kanban                   */
+/* ------------------------------ */
+
 .oe_group_vignette {
   padding: 8px 0;
   min-height: 100px;
@@ -71,9 +80,3 @@
 .oe_group_details li {
   margin: 2px 0;
 }
-
-.oe_group_description {
-}
-
-.oe_kanban_record div.true {
-}

From 12d8dceaa97212c38da0d27ee4b198c35ff24873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 14:23:06 +0200
Subject: [PATCH 067/397] [IMP] Thread widget: small tweaks (reply link now not
 shown anymore on record threaded view; post comment textarea now not shown
 anymoreon record threaded view; oe_mail_oe_right css class => oe_righit)

bzr revid: tde@openerp.com-20120515122306-0vf3sys8rov9znxk
---
 addons/mail/mail_group_view.xml     | 2 +-
 addons/mail/static/src/js/mail.js   | 9 +++++----
 addons/mail/static/src/xml/mail.xml | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 7babfbe877d..2a834c6fb71 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -62,7 +62,7 @@
                                 <field name="responsible_id" colspan="2"/>
                                 <label string="Visible by non members" colspan="1"/>
                                 <field name="public" nolabel="1"/>
-                                <field name="push_to_groups" colspan="2"/>
+                                <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
                             </group>
                             <group colspan="4" col="4">
                                 <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index aed36935906..1a80ef1ae83 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,7 +58,7 @@ openerp.mail = function(session) {
             this.display = {};
             this.display.show_post_comment = this.params.show_post_comment || false;
             this.display.show_msg_menu = this.params.is_wall;
-            this.display.show_reply = (this.params.thread_level > 0);
+            this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
             this.display.show_delete = ! this.params.is_wall;
             this.display.show_hide = this.params.is_wall;
             this.display.show_reply_by_email = ! this.params.is_wall;
@@ -81,7 +81,7 @@ openerp.mail = function(session) {
         },
         
         do_customize_display: function() {
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').show(); }
+            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').eq(0).show(); }
             if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
             if (! this.display.show_msg_menu) { this.$element.find('img.oe_mail_msg_menu_icon').hide(); }
         },
@@ -250,7 +250,8 @@ openerp.mail = function(session) {
                     });
                     self.display_comment(record);
                     self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
-                                                            'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id});
+                                                            'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
+                                                            'is_wall': self.params.is_wall});
                     self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
@@ -658,7 +659,7 @@ openerp.mail = function(session) {
                 $('<div class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
-                    'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
+                    'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true, 'is_wall': true}
                     );
                 self.thread_list.push(thread);
                 return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a11a5a2c6b8..1f95369339f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -50,7 +50,7 @@
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
-            <a href="#" class="oe_mail_compose oe_mail_oe_right">Send an e-mail
+            <a href="#" class="oe_mail_compose oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
             </a>
         </div>
@@ -91,7 +91,7 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <span class="oe_mail_oe_right">
+            <span class="oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>
         </p>
@@ -108,7 +108,7 @@
         </p>
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span><br />
-            <span class="oe_mail_oe_right">
+            <span class="oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>
         </p>

From ff233a6e69bae6ddd60bc4f61b1158b7005cc10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 14:46:03 +0200
Subject: [PATCH 068/397] [IMP] Thread widget: tweaked css to have a better
 wheel icon for menus

bzr revid: tde@openerp.com-20120515124603-h8pnittjdy8ff511
---
 addons/mail/static/src/css/mail.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 45263d84a63..abc954fef0b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -41,7 +41,7 @@
     padding: 2px;
 }
 
-.openerp div.oe_mail_thread_subthread img {
+.openerp div.oe_mail_thread_subthread img.oe_mail_msg_image {
     width: 30px;
     height: 30px;
 }

From fe0115f13abc8bb6d6fc8b1b8d01220e580e4997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 16:51:20 +0200
Subject: [PATCH 069/397] [IMP] mail.group: tweaked form view

bzr revid: tde@openerp.com-20120515145120-8agdbw1ool4mmzrz
---
 addons/mail/mail_group_view.xml           | 37 +++++++++++++++--------
 addons/mail/static/src/css/mail_group.css |  3 ++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 2a834c6fb71..6e44c06a874 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -51,7 +51,7 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <form string="Group Form" layout="manual">
-                    <sheet layout="auto">
+                    <sheet layout="auto" style="min-height: 0; max-height: none;">
                         <group colspan="1">
                             <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                         </group>
@@ -68,18 +68,31 @@
                                 <field name="description" colspan="4" nolabel="1"/>
                             </group>
                         </group>
-                        <group colspan="4" col="6">
-                            <field name="models" colspan="3">
-                                <tree string="Document models">
-                                    <field name="name"/>
-                                </tree>
-                            </field>
-                            <field name="groups" colspan="3">
-                                <tree string="Document groups">
-                                    <field name="name"/>
-                                </tree>
-                            </field>
+                        <group colspan="4" col="4">
+                            <p><a href="#" class="oe_mail_group_advanced">See advanced options for groups</a></p>
+                            <newline/>
+                            <div class="oe_mail_group_advanced_details">
+                                <group colspan="4" col="6">
+                                    <field name="models" colspan="3">
+                                        <tree string="Document models">
+                                            <field name="name"/>
+                                        </tree>
+                                    </field>
+                                    <field name="groups" colspan="3">
+                                        <tree string="Document groups">
+                                            <field name="name"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                            </div>
                         </group>
+                        <script>
+                            $('a.oe_mail_group_advanced').click(function() {
+                                var lapin = ($(this)).parents('.oe_form_autolayout').eq(0);
+                                console.log(lapin);
+                                lapin.find('div.oe_mail_group_advanced_details').toggle();
+                            });
+                        </script>
                     </sheet>
                     <div class="oe_form_sheet_width">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index a7be31e4801..13fd1567b77 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -2,6 +2,9 @@
 /* Group Form                     */
 /* ------------------------------ */
 
+div.oe_mail_group_advanced_details {
+  display: none;
+}
 
 /* ------------------------------ */
 /* Group Kanban                   */

From 71326159dc3c2ae5e66aba4dea7dfc5515c54da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 14:56:41 +0200
Subject: [PATCH 070/397] [FIX] mail_group_view: fixed remaining 'tree' in
 file.

bzr revid: tde@openerp.com-20120605125641-5qumyb6k243w7ew5
---
 addons/mail/mail_group_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 9a94ddcb0eb..6e44c06a874 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -55,7 +55,6 @@
                         <group colspan="1">
                             <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                         </group>
-<<<<<<< TREE
                         <group colspan="3" col="6">
                             <h2><field name="name" nolabel="1" colspan="4"/></h2>
                             <newline/>

From 32824f56b14e5512144e6ddb317c2b64ebaecf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 16:29:51 +0200
Subject: [PATCH 071/397] [FIX] Fixed a call to message_get_subscribers with
 wrong arguments; commented a data causing issues.

bzr revid: tde@openerp.com-20120605142951-3losakhdwehnjt8v
---
 addons/mail/data/mail_group_data.xml | 2 ++
 addons/mail/mail_thread.py           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 97a1eb59cc4..6cb2bec6ab1 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -8,7 +8,9 @@
         </record>
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
+<!--
             <field name="models" eval="[(4, ref('crm.lead'))]"/>
+-->
         </record>
         <record model="mail.group" id="group_all_employees">
             <field name="name">All Employees</field>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 31a13da785c..23370e63e9c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -165,7 +165,7 @@ class mail_thread(osv.Model):
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         
         # get subscribers
-        user_sub_ids = self.message_get_subscribers(cr, uid, thread_ids, True, context=context)
+        user_sub_ids = self.message_get_subscribers(cr, uid, thread_ids, context=context)
         
         # get hiden subscriptions
         subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', thread_ids), ('user_id', 'in', user_sub_ids)], context=context)

From 6fdbe631abdc3b5187235362dc220621293d314b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 16:45:02 +0200
Subject: [PATCH 072/397] [REM] Removed reference to already removed file.

bzr revid: tde@openerp.com-20120605144502-gz1jqoe9knz0vjqd
---
 addons/project_mailgate/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index cd66daa031e..34ace79c39e 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -45,7 +45,6 @@ There are two common alternatives to configure the mailbox integration:
     """,
     "init_xml": [],
     "update_xml": [
-        "security/ir.model.access.csv",
     ],
     'demo_xml': [
     ],

From d44767abc40ee612d107ad4946dc7d486d3bc31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 17:16:40 +0200
Subject: [PATCH 073/397] [IMP] Wall message search view: added a search on
 type adn some filters.

bzr revid: tde@openerp.com-20120605151640-al3ct3g9062or14k
---
 addons/mail/mail_message_view.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 632e68a2ad7..08913997ce2 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -67,6 +67,29 @@
                 <search string="Messages Search">
                     <field name="user_id"/>
                     <field name="body"/>
+                    <field name="type"/>
+                    <filter icon="terp-personal+" string="My Feeds"
+                            name="my_feeds" help="My Feeds"
+                            domain="[('user_id','=',uid)]"/>
+                    <filter icon="terp-personal+" string="Comments"
+                            name="comments" help="Comments"
+                            domain="[('type', '=', 'comment')]"/>
+                    <filter icon="terp-personal+" string="Notifications"
+                            name="notifications" help="Notifications"
+                            domain="[('type', '=', 'notification')]"/>
+                    <filter icon="terp-personal+" string="Emails"
+                            name="emails" help="Emails"
+                            domain="[('type', '=', 'email')]"/>
+                    <filter icon="terp-go-today" string="Today"
+                            name="today" help="Today"
+                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
+                                        ('date', '&gt;=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00'))
+                                    ]"/>
+                    <filter icon="terp-go-week" string="This week"
+                            name="7_days" help="This week"
+                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
+                                        ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
+                                    ]"/>
                 </search>
             </field>
         </record>

From 5993e382c41862245dbb4bf332c845e1dfe685eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 6 Jun 2012 10:52:42 +0200
Subject: [PATCH 074/397] [FIX] mail_group: fixed a remaining
 message_ids_social trying to play 'survivor'.

bzr revid: tde@openerp.com-20120606085242-289byf7jfpmt8mm5
---
 addons/mail/mail_group_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 6e44c06a874..b30133a8a0e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -95,7 +95,7 @@
                         </script>
                     </sheet>
                     <div class="oe_form_sheet_width">
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
                                 options='{"thread_level": 1}'/>
                     </div>
                 </form>

From 715e2f716a66f4187120fa9e829b26f3d5cdcd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 6 Jun 2012 11:58:59 +0200
Subject: [PATCH 075/397] [IMP] mail_group: improved form view (deleted
 min-height, fixed a 'see advanced options' link.

bzr revid: tde@openerp.com-20120606095859-a6qjuuywa3wm3eu7
---
 addons/mail/mail_group_view.xml           | 61 ++++++++++++-----------
 addons/mail/static/src/css/mail_group.css | 11 ++++
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index b30133a8a0e..3bd2efe9ae6 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -51,46 +51,51 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <form string="Group Form" layout="manual">
-                    <sheet layout="auto" style="min-height: 0; max-height: none;">
-                        <group colspan="1">
-                            <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                        </group>
-                        <group colspan="3" col="6">
-                            <h2><field name="name" nolabel="1" colspan="4"/></h2>
-                            <newline/>
-                            <group colspan="2" col="2">
-                                <field name="responsible_id" colspan="2"/>
-                                <label string="Visible by non members" colspan="1"/>
-                                <field name="public" nolabel="1"/>
-                                <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
-                            </group>
-                            <group colspan="4" col="4">
-                                <field name="description" colspan="4" nolabel="1"/>
-                            </group>
-                        </group>
+                    <sheet layout="auto" class="openerp_vive_les_frites">
                         <group colspan="4" col="4">
-                            <p><a href="#" class="oe_mail_group_advanced">See advanced options for groups</a></p>
-                            <newline/>
-                            <div class="oe_mail_group_advanced_details">
-                                <group colspan="4" col="6">
-                                    <field name="models" colspan="3">
+                            <group colspan="1" col="2">
+                                <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
+                            </group>
+                            <group colspan="3" col="6">
+                                <h2><field name="name" nolabel="1" colspan="4"/></h2>
+                                <newline/>
+                                <group colspan="2" col="2">
+                                    <field name="responsible_id" colspan="2"/>
+                                    <label string="Visible by non members" colspan="1"/>
+                                    <field name="public" nolabel="1"/>
+                                    <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                </group>
+                            </group>
+                        </group>
+                        <p><a href="#" class="oe_mail_group_advanced">See advanced options for groups</a></p>
+                        <newline/>
+                        <div class="oe_mail_group_advanced_details">
+                            <group colspan="4" col="4">
+                                <group colspan="2" col="3">
+                                    <h3>Models for automatic message fetching</h3>
+                                    <field name="models" colspan="3" nolabel="1">
                                         <tree string="Document models">
                                             <field name="name"/>
                                         </tree>
                                     </field>
-                                    <field name="groups" colspan="3">
+                                </group>
+                                <group colspan="2" col="3">
+                                    <h3>User groups for message forwarding</h3>
+                                    <field name="groups" colspan="3" nolabel="1">
                                         <tree string="Document groups">
                                             <field name="name"/>
                                         </tree>
                                     </field>
                                 </group>
-                            </div>
-                        </group>
+                            </group>
+                        </div>
                         <script>
                             $('a.oe_mail_group_advanced').click(function() {
-                                var lapin = ($(this)).parents('.oe_form_autolayout').eq(0);
-                                console.log(lapin);
-                                lapin.find('div.oe_mail_group_advanced_details').toggle();
+                                var parent_node = ($(this)).parents('.oe_form_sheet').eq(0);
+                                parent_node.find('div.oe_mail_group_advanced_details').toggle();
                             });
                         </script>
                     </sheet>
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 13fd1567b77..05656a0b431 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -5,6 +5,17 @@
 div.oe_mail_group_advanced_details {
   display: none;
 }
+ 
+.oe_form_sheetbg.openerp_vive_les_frites {
+  min-height: 0px;
+  max-height: none;
+}
+ 
+.oe_form_sheetbg.openerp_vive_les_frites .oe_form_sheet {
+  min-height: 0px;
+  max-height: none;
+}
+
 
 /* ------------------------------ */
 /* Group Kanban                   */

From 34db850d80b3d163e793fe559f2e598d7274eed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 6 Jun 2012 12:04:00 +0200
Subject: [PATCH 076/397] [IMP] mail_group: renamed custom class for sheet.

bzr revid: tde@openerp.com-20120606100400-uo4hutnefhvmu2pv
---
 addons/mail/mail_group_view.xml           | 2 +-
 addons/mail/static/src/css/mail_group.css | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 3bd2efe9ae6..1582ffe29b2 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -51,7 +51,7 @@
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <form string="Group Form" layout="manual">
-                    <sheet layout="auto" class="openerp_vive_les_frites">
+                    <sheet layout="auto" class="openerp_mail_group_sheet">
                         <group colspan="4" col="4">
                             <group colspan="1" col="2">
                                 <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 05656a0b431..e2459a02333 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -6,12 +6,12 @@ div.oe_mail_group_advanced_details {
   display: none;
 }
  
-.oe_form_sheetbg.openerp_vive_les_frites {
+.oe_form_sheetbg.openerp_mail_group_sheet {
   min-height: 0px;
   max-height: none;
 }
  
-.oe_form_sheetbg.openerp_vive_les_frites .oe_form_sheet {
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_sheet {
   min-height: 0px;
   max-height: none;
 }

From 4a2e5d81b04cfd4fd5230e1ecab7153639895fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 6 Jun 2012 12:27:25 +0200
Subject: [PATCH 077/397] [IMP] mail_group: changed public field name; removed
 custom label in form view, replaced by the standard label.

bzr revid: tde@openerp.com-20120606102725-04yqm9l4h6bk1oid
---
 addons/mail/mail_group.py       | 2 +-
 addons/mail/mail_group_view.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index d1611ff49d6..0c53ce942ae 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -112,7 +112,7 @@ class mail_group(osv.osv):
         'responsible_id': fields.many2one('res.users', string='Responsible',
                             ondelete='set null', required=True, select=1,
                             help="Responsible of the group that has all rights on the record."),
-        'public': fields.boolean('Public', help='This group is visible by non members. \
+        'public': fields.boolean('Visible by non members', help='This group is visible by non members. \
                             Invisible groups can add members through the invite button.'),
         'models': fields.many2many('ir.model', rel='mail_group_ir_model_rel',
                             id1='mail_group_id', id2='model_id',
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 1582ffe29b2..345bc171bb8 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,8 +61,7 @@
                                 <newline/>
                                 <group colspan="2" col="2">
                                     <field name="responsible_id" colspan="2"/>
-                                    <label string="Visible by non members" colspan="1"/>
-                                    <field name="public" nolabel="1"/>
+                                    <field name="public" colspan="2"/>
                                     <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
                                 </group>
                                 <group colspan="4" col="4">

From 3be1f8ea0140d4fd8d067f29bc4f83d3026df947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 6 Jun 2012 16:31:25 +0200
Subject: [PATCH 078/397] [IMP] mail_group: improved form view (as small as
 possible in form view; details visible only in editable mode).

bzr revid: tde@openerp.com-20120606143125-qrmtypr0ve5xguru
---
 addons/mail/mail_group_view.xml           | 22 +++++++---------------
 addons/mail/static/src/css/mail_group.css | 12 ++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 345bc171bb8..8fbe69cba4f 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -52,26 +52,24 @@
             <field name="arch" type="xml">
                 <form string="Group Form" layout="manual">
                     <sheet layout="auto" class="openerp_mail_group_sheet">
-                        <group colspan="4" col="4">
+                        <group colspan="4" col="8">
                             <group colspan="1" col="2">
                                 <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                             </group>
-                            <group colspan="3" col="6">
+                            <group colspan="7" col="6">
                                 <h2><field name="name" nolabel="1" colspan="4"/></h2>
                                 <newline/>
-                                <group colspan="2" col="2">
+                                <group colspan="4" col="4">
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                </group>
+                                <group colspan="2" col="2" class="oe_form_readonly_hidden">
                                     <field name="responsible_id" colspan="2"/>
                                     <field name="public" colspan="2"/>
                                     <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
                                 </group>
-                                <group colspan="4" col="4">
-                                    <field name="description" colspan="4" nolabel="1"/>
-                                </group>
                             </group>
                         </group>
-                        <p><a href="#" class="oe_mail_group_advanced">See advanced options for groups</a></p>
-                        <newline/>
-                        <div class="oe_mail_group_advanced_details">
+                        <div class="oe_form_readonly_hidden">
                             <group colspan="4" col="4">
                                 <group colspan="2" col="3">
                                     <h3>Models for automatic message fetching</h3>
@@ -91,12 +89,6 @@
                                 </group>
                             </group>
                         </div>
-                        <script>
-                            $('a.oe_mail_group_advanced').click(function() {
-                                var parent_node = ($(this)).parents('.oe_form_sheet').eq(0);
-                                parent_node.find('div.oe_mail_group_advanced_details').toggle();
-                            });
-                        </script>
                     </sheet>
                     <div class="oe_form_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index e2459a02333..cffae6a98a6 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -14,8 +14,20 @@ div.oe_mail_group_advanced_details {
 .oe_form_sheetbg.openerp_mail_group_sheet .oe_form_sheet {
   min-height: 0px;
   max-height: none;
+  padding: 0px 18px;
+  max-width: 80%;
 }
 
+/* Resize group logo */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_image > img {
+  max-width: 100px;
+  max-height: 100px;
+}
+
+/* Resize group description */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
+  height: 40px;
+}
 
 /* ------------------------------ */
 /* Group Kanban                   */

From e0df77d8abafd38b7d86a7368998ce1e34bb27e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Jun 2012 16:24:19 +0200
Subject: [PATCH 079/397] [COM] mail.js: added some comments. Need to commit
 before merging addons, so I do a dummy commit.

bzr revid: tde@openerp.com-20120608142419-ukoyxhv6g88hubfg
---
 addons/mail/static/src/js/mail.js | 38 ++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bef94955047..db718c70f87 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,6 +4,22 @@ openerp.mail = function(session) {
     
     var mail = session.mail = {};
 
+    /**
+     * Global variables for the Chatter
+     */
+
+    /**
+     * mail_int_mapping: structure to keep a trace of internal links mapping
+     *      mail_int_mapping['model'] = {
+     *          'name_get': [[id,label], [id,label], ...]
+     *          'fetch_ids': [id, id, ...] } */
+    var mail_int_mapping = mail.chatter_internal_mapping = {};
+    
+    /**
+     * mail_msg_struct: structure to orrganize chatter messages
+     */
+    var mail_msg_struct = mail.chatter_message_structure = {}; // TODO: USE IT OR NOT :)
+
     /** 
      * Thread widget: this widget handles the display of a thread of
      * messages. The [thread_level] parameter sets the thread level number:
@@ -47,6 +63,7 @@ openerp.mail = function(session) {
             this.params.is_wall = this.params.is_wall || this.params.records || false;
             this.params.msg_more_limit = this.params.msg_more_limit || 150;
             this.params.limit = this.params.limit || 100;
+            this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
             // datasets and internal vars
@@ -63,8 +80,6 @@ openerp.mail = function(session) {
             this.display.show_hide = this.params.is_wall;
             this.display.show_reply_by_email = ! this.params.is_wall;
             this.display.show_more = (this.params.thread_level == 0);
-            // internal links mapping
-            this.intlinks_mapping = {};
         },
         
         start: function() {
@@ -333,8 +348,23 @@ openerp.mail = function(session) {
 
         /**
          *    CONTENT MANIPULATION
+         * 
+         * Regular expressions
+         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
+         *   logins that are emails
+         *      1. '(void')
+         *      2. login@log.log
+         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
+         *   for internal links to model ir.attachment, id=3, and with
+         *   optional label 'My Label'. Note that having a '|Label' is not
+         *   mandatory, because the regex should still be correct.
+         *      1. '(void)'
+         *      2. 'ir'
+         *      3. 'attachment'
+         *      4. '3'
+         *      5. 'My Label'
          */
-        
+
         /**
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
          * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
@@ -389,11 +419,13 @@ openerp.mail = function(session) {
             }
         },
         
+        /** Removes html tags, except b, em, br */
         do_clean_text: function (string) {
             var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
         },
         
+        /** Replaces line bracks by html line breaks (br) */
         do_text_nl2br: function (str, is_xhtml) {   
             var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
             return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');

From 94777c3cd532ec8723894640dea60489a5dbc33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 12 Jun 2012 10:04:59 +0200
Subject: [PATCH 080/397] [FIX] crm_lead form view: added missing
 message_thread_read fields.

bzr revid: tde@openerp.com-20120612080459-krzkqevn79q2aszq
---
 addons/crm/crm_lead_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 89b884498cc..e8e9f9f679c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -80,6 +80,9 @@
                 <sheet>
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
+                    <newline/>
+                    <field name="message_thread_read"/>
+                    <newline/>
                     <group>
                         <group>
                             <field name="user_id" />

From 5ddea612b45537b33969f0f39b76bffcc95ced11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 12 Jun 2012 10:18:50 +0200
Subject: [PATCH 081/397] [FIX] mail_group: fixed form view with new api for
 7.0.

bzr revid: tde@openerp.com-20120612081850-27dmbmttszvja6qm
---
 addons/mail/mail_group_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 8fbe69cba4f..4fb35058170 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -50,8 +50,8 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group Form" layout="manual">
-                    <sheet layout="auto" class="openerp_mail_group_sheet">
+                <form string="Group Form" version="7.0">
+                    <sheet class="openerp_mail_group_sheet">
                         <group colspan="4" col="8">
                             <group colspan="1" col="2">
                                 <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
@@ -90,10 +90,10 @@
                             </group>
                         </div>
                     </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"
                                 options='{"thread_level": 1}'/>
-                    </div>
+                    </footer>
                 </form>
             </field>
         </record>

From 027f8e7fb7a366aa4906caba1c55e1d64c52617b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 14 Jun 2012 10:40:33 +0200
Subject: [PATCH 082/397] [TMP] mail.js: tmp update, will be probably
 discarded.

bzr revid: tde@openerp.com-20120614084033-yx65ehk81s2o99il
---
 addons/mail/mail_thread.py                    | 12 ++---
 addons/mail/static/src/js/mail.js             | 54 +++++++++++++++++++
 addons/mail/static/src/xml/mail.xml           |  5 ++
 .../mail/wizard/mail_compose_message_view.xml | 50 +++++++++++++++++
 4 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 977409c9d15..3c82754c676 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -651,9 +651,9 @@ class mail_thread(osv.Model):
         return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
 
     def message_thread_followers(self, cr, uid, ids, context=None):
-        """Returns a list of email addresses of the people following
-           this thread, including the sender of each mail, and the
-           people who were in CC of the messages, if any.
+        """ Returns a list of email addresses of the people following
+            this thread, including the sender of each mail, and the
+            people who were in CC of the messages, if any.
         """
         res = {}
         if isinstance(ids, (str, int, long)):
@@ -807,9 +807,9 @@ class mail_thread(osv.Model):
         """ Returns the current document followers. Basically this method
             checks in mail.subscription for entries with matching res_model,
             res_id.
-        
-            :param get_ids: if set to True, return the ids of users; if set
-                            to False, returns the result of a read in res.users
+            This method can be overriden to add implicit subscribers, such
+            as project managers, by adding their user_id to the list of
+            ids returned by this method.
         """
         subscr_obj = self.pool.get('mail.subscription')
         subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da6e89246c7..bceced31666 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -20,6 +20,55 @@ openerp.mail = function(session) {
      */
     var mail_msg_struct = mail.chatter_message_structure = {}; // TODO: USE IT OR NOT :)
 
+
+
+
+    /**
+     * ------------------------------------------------------------
+     * ComposeMessage widget
+     * ------------------------------------------------------------
+     * 
+     * This widget handles the display of a form to compose a new message.
+     */
+    
+    /* Add ComposeMessage widget to registry */
+    session.web.form.widgets.add('compose_message', 'openerp.mail.ComposeMessage');
+    
+    /* ComposeMessage is an extension of a Widget */
+    mail.compose_message = session.web.Widget.extend({
+        template: 'mail.compose_message',
+        
+        init: function(parent, params) {
+            this._super(parent);
+            console.log(params);
+            this.ds_compose = new session.web.DataSet(this, 'mail.compose.message');
+            this.form_view = new session.web.FormView(this, this.ds_compose, false, {
+                action_buttons: false,
+                pager: false,
+                initial_mode: 'edit',
+                }
+            );
+        },
+        
+        start: function(parent, params) {
+            this._super.apply(this, arguments);
+            console.log('start');
+            console.log(this);
+            var node = this.$element.find('div.caca');
+            var node = this.$element.find('p');
+            console.log(node);
+            var done = this.form_view.appendTo(node);
+            return done;
+        },
+        
+        destroy: function(parent, params) {
+            this._super.apply(this, arguments);
+        },
+    }),
+
+
+
+
     /** 
      * Thread widget: this widget handles the display of a thread of
      * messages. The [thread_level] parameter sets the thread level number:
@@ -92,6 +141,11 @@ openerp.mail = function(session) {
             else var display_done = this.init_comments();
             // customize display
             $.when(display_done).then(this.proxy('do_customize_display'));
+            
+            // add form view
+            this.caca = new mail.compose_message();
+            this.caca.appendTo(this.$element.find('div.oe_mail_thread_act'));
+            
             return display_done
         },
         
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 25c45a63dfb..80a43fd16a2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -44,6 +44,11 @@
         </div>
     </div>
 
+    <t t-name="mail.compose_message">
+        <div class="caca"><p>cacaproutboudin</p>
+        </div>
+    </t>
+
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 7090232b0d3..1787b893b6e 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -51,6 +51,56 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="email_compose_message_wizard_form">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Compose Email">
+                    <group col="6" colspan="4">
+<!--
+                        <field name="model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+-->
+                        <field name='filter_id' invisible="context.get('active_model',False)"/>
+                        <newline/>
+			<group colspan="4" col="4">
+			    <field name="email_from" colspan="4" required="1"/>
+			    <field name="email_to" colspan="4" required="1"/>
+			    <field name="email_cc" colspan="4"/>
+			    <field name="email_bcc" colspan="4"/>
+			    <field name="reply_to" colspan="4"/>
+			    <field name="subject" colspan="4" widget="char" size="512"/>
+			</group>
+			<newline/>
+			<separator string="Debug information" colspan="6"/>
+			<field name="model"/>
+                        <field name="res_id"/>
+			<newline/>
+                        <field name="references"/>
+                        <field name="message_id"/>
+<!--
+                        <field name="references" invisible="1"/>
+                        <field name="message_id" invisible="1"/>
+-->
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Body">
+                            <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                        </page>
+                        <page string="Attachments">
+                            <field name="attachment_ids" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="4" colspan="4">
+                        <label string="" name="placeholder" colspan="1"/>
+                        <button icon="gtk-close" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="action_email_compose_message_wizard" model="ir.actions.act_window">
             <field name="name">Compose Email</field>
             <field name="res_model">mail.compose.message</field>

From 3e47bfeed02f821275eca442cb01c46061498a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 14 Jun 2012 13:44:18 +0200
Subject: [PATCH 083/397] [IMP] mail.js: included form view to compose a
 message now basically working.

bzr revid: tde@openerp.com-20120614114418-x1no0ey51xmczta9
---
 addons/mail/static/src/js/mail.js             | 15 ++++---
 .../mail/wizard/mail_compose_message_view.xml | 41 +++----------------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bceced31666..2ea252fa2ba 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -41,24 +41,29 @@ openerp.mail = function(session) {
         init: function(parent, params) {
             this._super(parent);
             console.log(params);
-            this.ds_compose = new session.web.DataSet(this, 'mail.compose.message');
+            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message');
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
-                action_buttons: false,
-                pager: false,
+                /*action_buttons: false,
+                pager: false,*/
                 initial_mode: 'edit',
                 }
             );
+            this.form_view.on_button_cancel = function() {
+                console.log('cacaprout');
+            }
         },
         
         start: function(parent, params) {
+            var self = this;
             this._super.apply(this, arguments);
             console.log('start');
             console.log(this);
             var node = this.$element.find('div.caca');
             var node = this.$element.find('p');
             console.log(node);
-            var done = this.form_view.appendTo(node);
-            return done;
+            return $.when(this.form_view.appendTo(node)).pipe(function() {
+                self.form_view.do_show();
+            });
         },
         
         destroy: function(parent, params) {
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 1787b893b6e..ef33842928f 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -51,48 +51,17 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="email_compose_message_wizard_form">
+        <record model="ir.ui.view" id="email_compose_message_wizard_form2">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
+            <field name="priority">1</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email">
-                    <group col="6" colspan="4">
-<!--
-                        <field name="model" invisible="1"/>
-                        <field name="res_id" invisible="1"/>
--->
-                        <field name='filter_id' invisible="context.get('active_model',False)"/>
+                    <group col="4">
+                        <field name="subject" colspan="4" widget="char" size="512"/>
+                        <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
                         <newline/>
-			<group colspan="4" col="4">
-			    <field name="email_from" colspan="4" required="1"/>
-			    <field name="email_to" colspan="4" required="1"/>
-			    <field name="email_cc" colspan="4"/>
-			    <field name="email_bcc" colspan="4"/>
-			    <field name="reply_to" colspan="4"/>
-			    <field name="subject" colspan="4" widget="char" size="512"/>
-			</group>
-			<newline/>
-			<separator string="Debug information" colspan="6"/>
-			<field name="model"/>
-                        <field name="res_id"/>
-			<newline/>
-                        <field name="references"/>
-                        <field name="message_id"/>
-<!--
-                        <field name="references" invisible="1"/>
-                        <field name="message_id" invisible="1"/>
--->
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                    <group col="4" colspan="4">
                         <label string="" name="placeholder" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Cancel"/>
                         <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>

From 464d3c15ae726c7402e18f66ee0a36ab32732833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 10:36:10 +0200
Subject: [PATCH 084/397] [ADD] mail.message.common: added a
 destination_partners field, many2many to partners, to match the new way of
 sending emails (to partners).

bzr revid: tde@openerp.com-20120615083610-1rrou3m1lcqc4fcf
---
 addons/mail/__openerp__.py                       |  1 +
 addons/mail/mail_message.py                      |  3 +++
 addons/mail/wizard/mail_compose_message_view.xml | 16 ++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 2e19314bd46..4e23726f3cd 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -85,6 +85,7 @@ The main features are:
     'css': [
         'static/src/css/mail.css',
         'static/src/css/mail_group.css',
+        'static/src/css/mail_compose_message.css',
     ],
     'js': [
         'static/src/js/jquery.expander.min.js',
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3921d0b8e87..c164871ec3b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -117,6 +117,9 @@ class mail_message_common(osv.TransientModel):
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
+        'destination_partners': fields.many2many('res.partner',
+            'mail_message_common_partners_destination_rel',
+            'common_id', 'partner_id', 'Destination partners'),
         'headers': fields.text('Message Headers', readonly=1,
                         help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ef33842928f..442d41b6575 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -57,14 +57,18 @@
             <field name="priority">1</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Compose Email">
+                <form string="Compose Email" version="7.0">
                     <group col="4">
-                        <field name="subject" colspan="4" widget="char" size="512"/>
-                        <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                        <field name="subject" colspan="4" nolabel="1" placeholder="Subject..."/>
+                        <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"/>
+                        <field name="destination_partners" colspan="4" nolabel="1" widget="many2many_tags"/>
                         <newline/>
-                        <label string="" name="placeholder" colspan="1"/>
-                        <button icon="gtk-close" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
+                        <p> or <a href="#">Send a Message</a></p>
+                        <button icon="gtk-close" string="Cancel" special="cancel" />
+                        <p>
+                            Checklist . Attach
+                        </p>
                     </group>
                 </form>
             </field>

From c82893480236746fd29362f236df3d6b59b8b2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 10:36:56 +0200
Subject: [PATCH 085/397] [IMP] Chatter widgets: cleaned some name and
 templates, added some comments, cleaned a bit the draft of sending message
 embedded form view.

bzr revid: tde@openerp.com-20120615083656-mdyl8c49htxr5hq9
---
 addons/mail/static/src/css/mail.css | 44 +++++++-------
 addons/mail/static/src/js/mail.js   | 90 ++++++++++++++++++-----------
 addons/mail/static/src/xml/mail.xml | 43 +++++++++++---
 3 files changed, 112 insertions(+), 65 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index bc053d8417e..7226e1f04c5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -9,6 +9,17 @@
     background: white;
 }
 
+.openerp div.oe_mail_wall_main {
+    float: left;
+    width: 560px;
+    margin: 8px;
+}
+
+.openerp div.oe_mail_wall_aside {
+    margin-left: 565px;
+    margin: 8px;
+}
+
 .openerp div.oe_mail_wall_act {
     padding: 8px;
     background: #eee;
@@ -21,18 +32,6 @@
     clear: both; 
 }
 
-/* 2 columns view */
-.openerp div.oe_mail_wall_left {
-    float: left;
-    width: 560px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_right {
-    margin-left: 565px;
-    margin: 8px;
-}
-
 .openerp div.oe_mail_wall_threads {
     margin-top: 8px;
 }
@@ -86,6 +85,16 @@
     overflow: auto;
 }
 
+.openerp div.oe_mail_recthread_main {
+    float: left;
+    width: 560px;
+}
+
+.openerp div.oe_mail_recthread_aside {
+    float: right;
+    width: 250px;
+}
+
 /* Left-side CSS */
 .openerp div.oe_mail_recthread_actions {
     margin-bottom: 8px;
@@ -101,17 +110,6 @@
     margin: 4px;
 }
 
-/* RecordThread: 2 columns view */
-.openerp div.oe_mail_recthread_left {
-    float: left;
-    width: 560px;
-}
-
-.openerp div.oe_mail_recthread_right {
-    float: right;
-    width: 250px;
-}
-
 .openerp div.oe_mail_recthread_actions button {
     width: 120px;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2ea252fa2ba..3e820bc7e67 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -5,7 +5,10 @@ openerp.mail = function(session) {
     var mail = session.mail = {};
 
     /**
+     * ------------------------------------------------------------
      * Global variables for the Chatter
+     * ------------------------------------------------------------
+     * 
      */
 
     /**
@@ -21,72 +24,78 @@ openerp.mail = function(session) {
     var mail_msg_struct = mail.chatter_message_structure = {}; // TODO: USE IT OR NOT :)
 
 
-
-
     /**
      * ------------------------------------------------------------
      * ComposeMessage widget
      * ------------------------------------------------------------
      * 
      * This widget handles the display of a form to compose a new message.
+     * This form is an OpenERP form_view, build on a mail.compose.message
+     * wizard.
      */
     
     /* Add ComposeMessage widget to registry */
-    session.web.form.widgets.add('compose_message', 'openerp.mail.ComposeMessage');
+    session.web.form.widgets.add('mail.compose_message', 'openerp.mail.ComposeMessage');
     
     /* ComposeMessage is an extension of a Widget */
-    mail.compose_message = session.web.Widget.extend({
+    mail.ComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
         
         init: function(parent, params) {
             this._super(parent);
-            console.log(params);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message');
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
-                /*action_buttons: false,
-                pager: false,*/
+                action_buttons: false,
+                pager: false,
                 initial_mode: 'edit',
                 }
             );
-            this.form_view.on_button_cancel = function() {
-                console.log('cacaprout');
-            }
         },
         
+        /**
+         * widget start function
+         * - builds and initializes the form view
+         */
         start: function(parent, params) {
             var self = this;
             this._super.apply(this, arguments);
-            console.log('start');
-            console.log(this);
-            var node = this.$element.find('div.caca');
-            var node = this.$element.find('p');
-            console.log(node);
-            return $.when(this.form_view.appendTo(node)).pipe(function() {
+            var main_node = this.$element;
+            
+            return $.when(this.form_view.appendTo(main_node)).pipe(function() {
                 self.form_view.do_show();
+                //self.form_view.on_button_cancel = function() {
+                    //console.log('cacaprout');
+                //};
             });
         },
         
         destroy: function(parent, params) {
             this._super.apply(this, arguments);
         },
+        
+        //on_button_cancel: function() {
+            //console.log('boudin noir');
+        //},
     }),
 
-
-
-
     /** 
-     * Thread widget: this widget handles the display of a thread of
-     * messages. The [thread_level] parameter sets the thread level number:
+     * ------------------------------------------------------------
+     * Thread Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of a thread of messages. The
+     * [thread_level] parameter sets the thread level number:
      * - root message
      * - - sub message (parent_id = root message)
      * - - - sub sub message (parent id = sub message)
      * - - sub message (parent_id = root message)
-     * This widget has 2 ways of initialization, either you give records to be rendered,
-     * either it will fetch [limit] messages related to [res_model]:[res_id].
+     * This widget has 2 ways of initialization, either you give records
+     * to be rendered, either it will fetch [limit] messages related to
+     * [res_model]:[res_id].
      */
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add('Thread', 'openerp.mail.Thread');
 
     /* Thread is an extension of a Widget */
     mail.Thread = session.web.Widget.extend({
@@ -147,11 +156,11 @@ openerp.mail = function(session) {
             // customize display
             $.when(display_done).then(this.proxy('do_customize_display'));
             
-            // add form view
-            this.caca = new mail.compose_message();
-            this.caca.appendTo(this.$element.find('div.oe_mail_thread_act'));
+            // add message composition form view
+            this.compose_message = new mail.ComposeMessage();
+            var compose_done = this.compose_message.appendTo(this.$element.find('div.oe_mail_thread_act'));
             
-            return display_done
+            return display_done && compose_done;
         },
         
         do_customize_display: function() {
@@ -503,14 +512,29 @@ openerp.mail = function(session) {
     });
 
 
+    /** 
+     * ------------------------------------------------------------
+     * mail_thread Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of a thread of messages. The
+     * [thread_level] parameter sets the thread level number:
+     * - root message
+     * - - sub message (parent_id = root message)
+     * - - - sub sub message (parent id = sub message)
+     * - - sub message (parent_id = root message)
+     * This widget has 2 ways of initialization, either you give records
+     * to be rendered, either it will fetch [limit] messages related to
+     * [res_model]:[res_id].
+     */
+
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
-//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add('ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
         // QWeb template to use when rendering the object
-        template: 'RecordThread',
+        template: 'mail.record_thread',
 
        init: function() {
             this._super.apply(this, arguments);
@@ -556,11 +580,11 @@ openerp.mail = function(session) {
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget
-            this.$element.find('div.oe_mail_recthread_left').empty();
+            this.$element.find('div.oe_mail_recthread_main').empty();
             if (this.thread) this.thread.destroy();
             this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
                                                     'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
-            var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_left'));
+            var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
             return fetch_sub_done && thread_done;
         },
         
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 80a43fd16a2..b0fa456d36c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,37 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="Wall" class="oe_mail_wall">
+    <!-- 
+        wall main template
+        Template used to display the communication history in the
+        wall.
+        -->
+    <div t-name="mail.wall" class="oe_mail_wall">
         <table class="oe_view_manager_header">
             <tr class="oe_header_row">
                 <td><h2 class="oe_view_title">All Feeds</h2></td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
         </table>
-        <div class="oe_mail_wall_left">
+        <div class="oe_mail_wall_main">
             <div class="oe_mail_wall_act">
                 <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
-            <div class="oe_clear"></div>
+            <div class="oe_clear"/>
             <div class="oe_mail_wall_threads">
+                <!-- contains threads -->
             </div>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
         </div>
-        <div class="oe_mail_wall_right"></div>
+        <div class="oe_mail_wall_aside">
+                <!-- contains currently nothing -->
+        </div>
     </div>
 
-    <t t-name="WallThreadContainer">
+    <!--
+        thread_container template for the wall
+        Each discussion thread is be contained inside this template
+        -->
+    <t t-name="mail.wall.thread_container">
     </t>
 
-    <div t-name="RecordThread" class="oe_mail_recthread">
+    <!--
+        record_thread main template
+        Template used to display the communciation history in documents
+        form view.
+        -->
+    <div t-name="mail.record_thread" class="oe_mail_recthread">
         <h4>History and Comments</h4>
-        <div class="oe_mail_recthread_left">
+        <div class="oe_mail_recthread_main">
+            <!-- contains the document thread -->
         </div>
-        <div class="oe_mail_recthread_right">
+        <div class="oe_mail_recthread_aside">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
                 <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
@@ -44,9 +62,16 @@
         </div>
     </div>
 
+    <!--
+        compose_message template
+        This template holds the composition form to write a note or send
+        an e-mail.
+        -->
     <t t-name="mail.compose_message">
-        <div class="caca"><p>cacaproutboudin</p>
+        <div class="oe_mail_compose_message">
+            <!-- contains the composition form -->
         </div>
+        <div class="oe_clear"/>
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">

From d687bf3195ad67c9c85bc9fb8fa0aa1899036958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 14:40:29 +0200
Subject: [PATCH 086/397] [IMP] mail_message: improved form view (for legacy
 and 'feed' form views)

bzr revid: tde@openerp.com-20120615124029-8hc0cevj54gxiriu
---
 addons/mail/mail_message_view.xml | 142 ++++++++++++++++--------------
 1 file changed, 76 insertions(+), 66 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 362748f3a85..b8cf9d03f8a 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -26,20 +26,25 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message" version="7.0">
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="subject"/>
-                            <field name="date"/>
-                            <field name="type"/>
-                            <field name="body_text"/>
+                            <group>
+                                <field name="subject"/>
+                                <field name="user_id"/>
+                                <field name="date"/>
+                                <field name="type"/>
+                                <field name="content_subtype"/>
+                                <field name="destination_partner_ids" widget="many2many_tags" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="model"/>
+                                <field name="res_id"/>
+                                <field name="parent_id"/>
+                                <field name="body_text"/>
+                                <field name="body_html"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="user_id" string="User"/>
-                            <field name="model"/>
-                            <field name="res_id"/>
-                            <field name="parent_id"/>
-                        </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -102,64 +107,69 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
-                    <label for="subject" class="oe_form_readonly_hidden"/>
-                    <h1><field name="subject"/></h1>
-                    <label for="user_id"/>
-                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
-                    <group col="4">
-                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                        <field name="type"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Details">
-                            <group string="Recipients">
-                                <field name="email_from"/>
-                                <field name="email_to"/>
-                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
-                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
-                            </group>
-                            <group col="4" string="Message Details">
-                                <field name="model"/>
-                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
-                                    attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
-                                <field name="res_id"/>
-                            </group>
-                            <notebook>
-                                <page string="Body (Rich)" attrs="{'invisible':[('content_subtype','=','plain')]}">
-                                    <field name="body_html" widget="text_html"/>
-                                </page>
-                                <page string="Body (Plain)">
-                                    <field name="body_text" widget="text"/>
-                                </page>
-                            </notebook>
-                            <group col="5">
-                                <field name="state" colspan="2"/>
-                                <field name="content_subtype" attrs="{'invisible':[('content_subtype', '=', False)]}"/>
-                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                            </group>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids"/>
-                        </page>
-                        <page string="Advanced" groups="base.group_no_one">
-                            <group col="2" colspan="4">
-                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
-                                <field name="auto_delete"/>
-                                <field name="headers" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" attrs="{'invisible':[('original', '=', False)]}"/>
-                                <field name="message_id"/>
+                    <sheet>
+                        <label for="subject" class="oe_form_readonly_hidden"/>
+                        <h1><field name="subject"/></h1>
+                        <label for="user_id" class="oe_form_readonly_hidden"/>
+                        <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
+                        <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                        <notebook colspan="4">
+                            <page string="Message Details">
+                                <group string="Recipients">
+                                    <field name="email_from"/>
+                                    <field name="email_to"/>
+                                    <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                    <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                    <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                                </group>
+                                <group string="Partner information">
+                                    <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                                    <field name="destination_partner_ids" readonly="1" WIDGET="many2many_tags"/>
+                                </group>
+                                <notebook>
+                                    <page string="Body (Rich)">
+                                        <field name="body_html" widget="text_html"/>
+                                    </page>
+                                    <page string="Body (Plain)">
+                                        <field name="body_text" widget="text"/>
+                                    </page>
+                                </notebook>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group>
+                                    <group string="Type details">
+                                        <field name="auto_delete"/>
+                                        <field name="type"/>
+                                        <field name="content_subtype"/>
+                                        <field name="state" colspan="2"/>
+                                        <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                        <field name="original" attrs="{'invisible':[('original', '=', False)]}"/>
+                                    </group>
+                                    <group string="Headers">
+                                        <field name="message_id"/>
 <!--
-                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                        <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
 -->
-                                <field name="references"/>
+                                        <field name="references"/>
 <!--
-                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+                                        <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
 -->
-                            </group>
-                        </page>
-                    </notebook>
+                                        <field name="headers" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                    </group>
+                                </group>
+                                <group string="Message Details">
+                                    <field name="model"/>
+                                    <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
+                                            attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
+                                    <field name="res_id"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>

From f3755ac0a4dabecc5dafc77bd36316db17c3b87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 14:40:50 +0200
Subject: [PATCH 087/397] [REF] mail.message.common: destination_partners ->
 destination_partner_ids

bzr revid: tde@openerp.com-20120615124050-hvj0r7bxusgvc1le
---
 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 c164871ec3b..beb6662e16a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -117,7 +117,7 @@ class mail_message_common(osv.TransientModel):
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'destination_partners': fields.many2many('res.partner',
+        'destination_partner_ids': fields.many2many('res.partner',
             'mail_message_common_partners_destination_rel',
             'common_id', 'partner_id', 'Destination partners'),
         'headers': fields.text('Message Headers', readonly=1,

From d9a31507edacf3acaf0351cc3e4f4baa706aac0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 15:32:37 +0200
Subject: [PATCH 088/397] [ADD] web: added CLEditor library, a minimal WYSIWYG
 editor on jquery.

bzr revid: tde@openerp.com-20120615133237-twl095i18ezzdv1a
---
 addons/web/__openerp__.py                     |    2 +
 .../static/lib/cleditor/images/buttons.gif    |  Bin 0 -> 3064 bytes
 .../static/lib/cleditor/images/toolbar.gif    |  Bin 0 -> 68 bytes
 .../static/lib/cleditor/jquery.cleditor.css   |   24 +
 .../static/lib/cleditor/jquery.cleditor.js    | 1132 +++++++++++++++++
 .../lib/cleditor/jquery.cleditor.min.js       |   31 +
 6 files changed, 1189 insertions(+)
 create mode 100644 addons/web/static/lib/cleditor/images/buttons.gif
 create mode 100644 addons/web/static/lib/cleditor/images/toolbar.gif
 create mode 100644 addons/web/static/lib/cleditor/jquery.cleditor.css
 create mode 100644 addons/web/static/lib/cleditor/jquery.cleditor.js
 create mode 100644 addons/web/static/lib/cleditor/jquery.cleditor.min.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 417fea91434..53fe4dbb0b3 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -10,6 +10,7 @@
     'auto_install': True,
     'post_load' : 'wsgi_postload',
     'js' : [
+        "static/lib/cleditor/jquery.cleditor.min.js",
         "static/lib/datejs/globalization/en-US.js",
         "static/lib/datejs/core.js",
         "static/lib/datejs/parser.js",
@@ -56,6 +57,7 @@
         "static/src/js/view_editor.js"
     ],
     'css' : [
+        "static/lib/cleditor/jquery.cleditor.css",
         "static/lib/jquery.superfish/css/superfish.css",
         "static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css",
         "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css",
diff --git a/addons/web/static/lib/cleditor/images/buttons.gif b/addons/web/static/lib/cleditor/images/buttons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e464d0c8c7ac7c8dd29d165e4eff36ea27fdd2d
GIT binary patch
literal 3064
zcmYL^X;@PE0*C*H{UG3B(HPVT+}lJQEmA8`RNN9x)5$WdG0n7Wa%(>*87>*-l9eUy
zlvYe>Svk|eG;PNw8*8eIOVd7?b<1ugclmOE&-1<?-fzF)kRZ{*B!K6FAz!ez{QjNa
z?@UimPyKz^?BvwZJO1qpNnKdb)_!{X_HBm2SJfp63eDnT{mYRS`VvL!o58f^v$v|-
zZ`~Q00szQ@WWr@N=G0U(Ft1bAM&{oefB8<MJu4Ktt13@+-Y$Le_(@T>LbAay@qWr9
zI4L?>-k~dL`1PeAms!%W?{3qox}CG<`vv9IjmlSN9jd9Gxp?oIq&3-VL&S^yGB$0w
z{2Ru%<s(dFiEt(`o56qhum3;6X95I(FPQtk^q)_FWX6tW%I5O+4>bLJE#0TisLKjH
zx#IM2d(MqF+b)~*dEstH?mX|<c5CCMe@t}kSbF-;w^QA_?!5hCMwR&msy&5!)kVc6
zrTfbEYswEqapI~fY7QNaq|W2<0N~M=5?fkZnM~@Dlc$oYfEa7TJAHud;zDd+YC|Qu
zux(PPOxD1)>#Seb;9P7Rn%MLvIYbHIKL~5}J^{r!kBuxFbAB4hb9n7wV?zhHa3b#G
zr%x=$TNMu8<m|;Ea{qd*p`em6o70#ns4S!$k)iQMBHNOupwxFs3)BLR&`H8Qpf%Vz
zm8-IJKR>-z?q+eg^z*nBe`J9Ll5j>4-)T<!+ACGxKjnIf&a9mBofrjbX1L`&uHm@E
zE$_Y-odEVLRJ;!pfdfco2)f0BL__&&4NBq*O|9L*oQyxuZ?0%Rg5~y5((so?Z06Qq
z{mpp+YtA{PBBhd{5iE(?v6lSQg&(TdH<}=c#y-#owmU3H)l|}SZn}qPs?&Grlo7Gy
zBg5M3xq;%Be5K&bdFqdkqxi?vW4xR}-;sAp3YZrkF(vvTnFZf<Y?{Ir?IAyR$g^Qi
zjP{Wb@9PEP)w_<diF86tV^7j^5^wANdpF`7uC%*2>%1`wyyJwD<|#Izv@n9sT1m3k
z@e9IV55;+Px-$)msZ6oCXKw^S5dc>WDFVokq)-p-2Q)JRc2coH>1QVoe_GYx;CGq2
zjF^W3tr;pQ%_>HNG2oj<2`szqzCz<F8CkKR{p30^+pCtZvf#vb;K|=>1o=ekc#j?!
zOi{`cdEwyU;dz@s^oCmgm@5tUoHd9>0^5U1lBHumVT<+Gt+rVPIhmA0mtm_YnnIJr
zV#Fyb0LQnL`_qJuNB~UcYe0PHx8LuT%e}p=ILvND47q7e^cF${cZl3-`cTKB=sGd-
z28q@mo-?;gdK&+g_gdc<ty2N($z~MikZMX~+5DVmNr5z`Ub=|7IRLf`j|za#ERHgd
zBd`3+#pE)HB!Kp)_DCc9{r#{}hP|JB9eeAFNgiu{jJuRvWvjS?g%fN8H?&28cUAJa
zHw`mWiqBLW4Gf<M!S`m`u4K)teDn;@3O7D*4fg`Bb66U9mBq1GmuJ~28)wXF`c6JO
zkr_dB_a}N2<anG_DFT+=sm@K@=G(1L+$LPvHex~f2?=07_`b7l5nZiqW-;8v`25rv
zuN)uzb}ZsbT^*&V_wHb5LI&*xul(d9?}?24cc0i>pDMEJb`PW_gh69SiO|DA=U`L>
z(3ZkXQ0~oAVl?R=?s#J1l3%tytJ|BHa+I;KR%#%xj>cUH(@ppG#-1aY`(Vza1S;^G
zFZjgS{N;;~W2jh2Jf?4Zap0CcTltmMAU<dq{(7ccb;Fz8DzRvwnTd@)Zy&uUE!j}^
z4=AuFejI{~no;J#br;u*-sjIwdlJggKy<h9t11Fcr=+@ND%qw+B2f?iStjOpx(+}{
z7W%N-h;@n-c7gSUeq{g`_a+&?^IZuk4V{_(xRFHAlc9f+x;FJ`@eA|@dMYAxS;^QP
zk@|>{Riol^=LNwvD`6Ib&ZyMl{G_<M14N%$bD2pkzK?5jOv<o$kF8S0Q3P>T{ShK@
zhAEBQJ{{p<2yIQECztIhR^AdzI6MhlTWS36=`ZG9%J}<(CF5MCQ#iKTvL-MfD9DeQ
zzCSm>eH>Sg)xI|Lv)2|szEzDLWv8a32nN8w^;SAhL5GA|3GVt8G`d9$OBxM}auk*b
zQocUYRA+Hu^73V+5gn=lV6I6R<0F?SCdH(W&zc>*5FGWy5df}WAYD;v497^a)E;n3
zvuTbkM8Wl|xYe#6QCa!)bca2?G()Z51>1|M@>3wjMD$SHWPFrKRG%ZMLcNQXZBD;^
z%rBI!FI$t5<r<r=GB4r!Ym8JeTIkFtBa5P0H`PH<x^`8l0wQ`MdvLE?sJ@<Tvgmrh
z>ZKF@gKd+e%LDyi234~e^eqc6`=Mp`EOB|kwnIp2Xp6}0W%$9;7?MbT&5;5K9$IB|
zNl*c@gAW7>Y*v-Jj?lE}SfG8wmnUOzWcsG^AQK8GGHhx%8uEDW<SB4no^VlHL!(&}
z{!kWNygy`j&b<eEE%0j8H*UgpwK9P#y5X1x%#)VV`m!5b`50-W_U5m~<EqUoKAx$u
zb7A|XXa+WZ+(LYp9=5i)Z?}(SeQ=lIVGh=3SA4Z8_k<M33q|(^Wx+_>D&pK?y7z2@
z)`gEDD&N9gTlZ^9)xfouPknjeIDAokDr>Xn%-R?JI5-~Qt&RC<8X=WtDg*pI`Hm=7
zK>_CEjX{T=$nRE^HRPdN{8-LTnI<701X+x;izB6`E^)#f!XiG1<tuP*u3*8w2^{1L
zfCFYAIF{nmo_11TJsH;(+s4?mmVlEzVp2-{vFbeB<1~MIOhS=W!16g`H*MLoGx7TN
zyv`8yAY&bJ{kob09k@ZNsFdSX%?mnwr|io2l>$eXUP^q^=!U5xl}%+B#p2ayWw6C9
zyd!pFO9SxDxdf%hXT!1GP)4r)uSFU{OKVk8SXgN5LAN`%v&()z+BgC0Jtx`GB0~o$
zqxi)+F+7|kj)~LatlG7ev?(`E&-VS6l{4Vrh?mjjP4~7cu{6i`vU;<Zf(B+70%rb8
z<42g7p^#y%!6LK(e$A-5fD)`Q59UwbFpKHro}5eWOm)2U!#&e*e<JUER)p%@ii)8*
z<6*@K+cY*c&)`ExanW>E!6$pD$cf7=^1)^ay0y6R#Gan6!SOH-e|uXaxRku$p=*tG
z=;dE08E3i+sM13n#D(Gw3^YGKEUTF)ID2U4mp28*bM+nJ`O`U0dm=HL3q^9UMYXDa
z{KMar!EYhnp+S=YW9?U<DU>RAd*Px5(PMN&^C7t>G|(`L=~0}Q9PE@zzHd<f*;b`T
z6Mgx32Qf-OFeNV&#f!xLgAUJMCCO@pLq0va=_Iq)Pc8|w1DEEX{gyPy8;^s2zdFV7
z3E1qe>wsfvI&qQs6k|N-=M(!{tBz~X`;J<ZtEh`z9J4OUqZ<}#-+a+%AZ9P~cA)8k
z-4|WTLTBl1bJ=@aX#TTd|6P-H!T!)!3*xFLUuna~hn7VpwpIHIh{e<5nAVGgzcaMN
ziyzLiWZzaJzyvuO&$FfOxL9u9^AHgj+RyM;aKu*f;QYzs8|&K=rYK&bhsRm+%PTM4
zk*?_{t0i1?ee){Iqr!sCL(?kZ_Rk=3+LJTe9Z+MiiJNmM8L;k1Nvz=H>w}cOcPpc`
z7O4odE14q`5NClrXCvX!m@|^I-K-@onjW3UoDfWZB3vC>=02g^au#^Xq3ox)^OISw
z+?~M)u$SeF^fPkyWZSwB{w@IZquKq1z;zNg&RIU166LyXmxVPd9VWtBysQRr^{V{y
zgb%IOA9M2}w0Q(<_Zp*cW-weWS5=tOZfI$3MluuZuo)n^DdJM&<8H=s-Xiq%JqlQk
zL+&#&L^xoC-g0(9*t{KGdv}RcE4k|BnLwt)ll3aDQ57<w!rAYMKmkF+p=3f0PU`Bs
zqChV7a97bLHKBH(C>%{YKEJq8UDU!QCJ}b8K381Ozwp9e>ZKa{lHB5s_>yyZC0#Wo
i7rRQjhfAz}n<~M$r9Gn3-uTk1d8Gq2r9UDB;QMa~Mf*?y

literal 0
HcmV?d00001

diff --git a/addons/web/static/lib/cleditor/images/toolbar.gif b/addons/web/static/lib/cleditor/images/toolbar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e6eb2da554925c9587169b7fc1dade3d37da9c46
GIT binary patch
literal 68
zcmZ?wbhEHbWMq(HSj52a`t|EipFaKn|9|GpnQz~|Wq<+2pDbXe4u}M)Wnkvi*m%cL
L;S}c)4+d)hRvr~C

literal 0
HcmV?d00001

diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.css b/addons/web/static/lib/cleditor/jquery.cleditor.css
new file mode 100644
index 00000000000..6ac490bcfc4
--- /dev/null
+++ b/addons/web/static/lib/cleditor/jquery.cleditor.css
@@ -0,0 +1,24 @@
+.cleditorMain {border:1px solid #999; padding:0 1px 1px; background-color:white}
+.cleditorMain iframe {border:none; margin:0; padding:0}
+.cleditorMain textarea {border:none; margin:0; padding:0; overflow-y:scroll; font:10pt Arial,Verdana; resize:none; outline:none /* webkit grip focus */}
+.cleditorToolbar {background: url('images/toolbar.gif') repeat}
+.cleditorGroup {float:left; height:26px}
+.cleditorButton {float:left; width:24px; height:24px; margin:1px 0 1px 0; background: url('images/buttons.gif')}
+.cleditorDisabled {opacity:0.3; filter:alpha(opacity=30)}
+.cleditorDivider {float:left; width:1px; height:23px; margin:1px 0 1px 0; background:#CCC}
+.cleditorPopup {border:solid 1px #999; background-color:white; position:absolute; font:10pt Arial,Verdana; cursor:default; z-index:10000}
+.cleditorList div {padding:2px 4px 2px 4px}
+.cleditorList p,
+.cleditorList h1,
+.cleditorList h2,
+.cleditorList h3,
+.cleditorList h4,
+.cleditorList h5,
+.cleditorList h6,
+.cleditorList font {padding:0; margin:0; background-color:Transparent}
+.cleditorColor {width:150px; padding:1px 0 0 1px}
+.cleditorColor div {float:left; width:14px; height:14px; margin:0 1px 1px 0}
+.cleditorPrompt {background-color:#F6F7F9; padding:4px; font-size:8.5pt}
+.cleditorPrompt input,
+.cleditorPrompt textarea {font:8.5pt Arial,Verdana;}
+.cleditorMsg {background-color:#FDFCEE; width:150px; padding:4px; font-size:8.5pt}
diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.js b/addons/web/static/lib/cleditor/jquery.cleditor.js
new file mode 100644
index 00000000000..c0763136c99
--- /dev/null
+++ b/addons/web/static/lib/cleditor/jquery.cleditor.js
@@ -0,0 +1,1132 @@
+/**
+ @preserve CLEditor WYSIWYG HTML Editor v1.3.0
+ http://premiumsoftware.net/cleditor
+ requires jQuery v1.4.2 or later
+
+ Copyright 2010, Chris Landowski, Premium Software, LLC
+ Dual licensed under the MIT or GPL Version 2 licenses.
+*/
+
+// ==ClosureCompiler==
+// @compilation_level SIMPLE_OPTIMIZATIONS
+// @output_file_name jquery.cleditor.min.js
+// ==/ClosureCompiler==
+
+(function($) {
+
+  //==============
+  // jQuery Plugin
+  //==============
+
+  $.cleditor = {
+
+    // Define the defaults used for all new cleditor instances
+    defaultOptions: {
+      width:        500, // width not including margins, borders or padding
+      height:       250, // height not including margins, borders or padding
+      controls:     // controls to add to the toolbar
+                    "bold italic underline strikethrough subscript superscript | font size " +
+                    "style | color highlight removeformat | bullets numbering | outdent " +
+                    "indent | alignleft center alignright justify | undo redo | " +
+                    "rule image link unlink | cut copy paste pastetext | print source",
+      colors:       // colors in the color popup
+                    "FFF FCC FC9 FF9 FFC 9F9 9FF CFF CCF FCF " +
+                    "CCC F66 F96 FF6 FF3 6F9 3FF 6FF 99F F9F " +
+                    "BBB F00 F90 FC6 FF0 3F3 6CC 3CF 66C C6C " +
+                    "999 C00 F60 FC3 FC0 3C0 0CC 36F 63F C3C " +
+                    "666 900 C60 C93 990 090 399 33F 60C 939 " +
+                    "333 600 930 963 660 060 366 009 339 636 " +
+                    "000 300 630 633 330 030 033 006 309 303",    
+      fonts:        // font names in the font popup
+                    "Arial,Arial Black,Comic Sans MS,Courier New,Narrow,Garamond," +
+                    "Georgia,Impact,Sans Serif,Serif,Tahoma,Trebuchet MS,Verdana",
+      sizes:        // sizes in the font size popup
+                    "1,2,3,4,5,6,7",
+      styles:       // styles in the style popup
+                    [["Paragraph", "<p>"], ["Header 1", "<h1>"], ["Header 2", "<h2>"],
+                    ["Header 3", "<h3>"],  ["Header 4","<h4>"],  ["Header 5","<h5>"],
+                    ["Header 6","<h6>"]],
+      useCSS:       false, // use CSS to style HTML when possible (not supported in ie)
+      docType:      // Document type contained within the editor
+                    '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+      docCSSFile:   // CSS file used to style the document contained within the editor
+                    "", 
+      bodyStyle:    // style to assign to document body contained within the editor
+                    "margin:4px; font:10pt Arial,Verdana; cursor:text"
+    },
+
+    // Define all usable toolbar buttons - the init string property is 
+    //   expanded during initialization back into the buttons object and 
+    //   seperate object properties are created for each button.
+    //   e.g. buttons.size.title = "Font Size"
+    buttons: {
+      // name,title,command,popupName (""=use name)
+      init:
+      "bold,,|" +
+      "italic,,|" +
+      "underline,,|" +
+      "strikethrough,,|" +
+      "subscript,,|" +
+      "superscript,,|" +
+      "font,,fontname,|" +
+      "size,Font Size,fontsize,|" +
+      "style,,formatblock,|" +
+      "color,Font Color,forecolor,|" +
+      "highlight,Text Highlight Color,hilitecolor,color|" +
+      "removeformat,Remove Formatting,|" +
+      "bullets,,insertunorderedlist|" +
+      "numbering,,insertorderedlist|" +
+      "outdent,,|" +
+      "indent,,|" +
+      "alignleft,Align Text Left,justifyleft|" +
+      "center,,justifycenter|" +
+      "alignright,Align Text Right,justifyright|" +
+      "justify,,justifyfull|" +
+      "undo,,|" +
+      "redo,,|" +
+      "rule,Insert Horizontal Rule,inserthorizontalrule|" +
+      "image,Insert Image,insertimage,url|" +
+      "link,Insert Hyperlink,createlink,url|" +
+      "unlink,Remove Hyperlink,|" +
+      "cut,,|" +
+      "copy,,|" +
+      "paste,,|" +
+      "pastetext,Paste as Text,inserthtml,|" +
+      "print,,|" +
+      "source,Show Source"
+    },
+
+    // imagesPath - returns the path to the images folder
+    imagesPath: function() { return imagesPath(); }
+
+  };
+
+  // cleditor - creates a new editor for each of the matched textareas
+  $.fn.cleditor = function(options) {
+
+    // Create a new jQuery object to hold the results
+    var $result = $([]);
+
+    // Loop through all matching textareas and create the editors
+    this.each(function(idx, elem) {
+      if (elem.tagName == "TEXTAREA") {
+        var data = $.data(elem, CLEDITOR);
+        if (!data) data = new cleditor(elem, options);
+        $result = $result.add(data);
+      }
+    });
+
+    // return the new jQuery object
+    return $result;
+
+  };
+    
+  //==================
+  // Private Variables
+  //==================
+
+  var
+
+  // Misc constants
+  BACKGROUND_COLOR = "backgroundColor",
+  BUTTON           = "button",
+  BUTTON_NAME      = "buttonName",
+  CHANGE           = "change",
+  CLEDITOR         = "cleditor",
+  CLICK            = "click",
+  DISABLED         = "disabled",
+  DIV_TAG          = "<div>",
+  TRANSPARENT      = "transparent",
+  UNSELECTABLE     = "unselectable",
+
+  // Class name constants
+  MAIN_CLASS       = "cleditorMain",    // main containing div
+  TOOLBAR_CLASS    = "cleditorToolbar", // toolbar div inside main div
+  GROUP_CLASS      = "cleditorGroup",   // group divs inside the toolbar div
+  BUTTON_CLASS     = "cleditorButton",  // button divs inside group div
+  DISABLED_CLASS   = "cleditorDisabled",// disabled button divs
+  DIVIDER_CLASS    = "cleditorDivider", // divider divs inside group div
+  POPUP_CLASS      = "cleditorPopup",   // popup divs inside body
+  LIST_CLASS       = "cleditorList",    // list popup divs inside body
+  COLOR_CLASS      = "cleditorColor",   // color popup div inside body
+  PROMPT_CLASS     = "cleditorPrompt",  // prompt popup divs inside body
+  MSG_CLASS        = "cleditorMsg",     // message popup div inside body
+
+  // Test for ie
+  ie = $.browser.msie,
+  ie6 = /msie\s6/i.test(navigator.userAgent),
+
+  // Test for iPhone/iTouch/iPad
+  iOS = /iphone|ipad|ipod/i.test(navigator.userAgent),
+
+  // Popups are created once as needed and shared by all editor instances
+  popups = {},
+
+  // Used to prevent the document click event from being bound more than once
+  documentClickAssigned,
+
+  // Local copy of the buttons object
+  buttons = $.cleditor.buttons;
+
+  //===============
+  // Initialization
+  //===============
+
+  // Expand the buttons.init string back into the buttons object
+  //   and create seperate object properties for each button.
+  //   e.g. buttons.size.title = "Font Size"
+  $.each(buttons.init.split("|"), function(idx, button) {
+    var items = button.split(","), name = items[0];
+    buttons[name] = {
+      stripIndex: idx,
+      name: name,
+      title: items[1] === "" ? name.charAt(0).toUpperCase() + name.substr(1) : items[1],
+      command: items[2] === "" ? name : items[2],
+      popupName: items[3] === "" ? name : items[3]
+    };
+  });
+  delete buttons.init;
+
+  //============
+  // Constructor
+  //============
+
+  // cleditor - creates a new editor for the passed in textarea element
+  cleditor = function(area, options) {
+
+    var editor = this;
+
+    // Get the defaults and override with options
+    editor.options = options = $.extend({}, $.cleditor.defaultOptions, options);
+
+    // Hide the textarea and associate it with this editor
+    var $area = editor.$area = $(area)
+      .hide()
+      .data(CLEDITOR, editor)
+      .blur(function() {
+        // Update the iframe when the textarea loses focus
+        updateFrame(editor, true);
+      });
+
+    // Create the main container and append the textarea
+    var $main = editor.$main = $(DIV_TAG)
+      .addClass(MAIN_CLASS)
+      .width(options.width)
+      .height(options.height);
+
+    // Create the toolbar
+    var $toolbar = editor.$toolbar = $(DIV_TAG)
+      .addClass(TOOLBAR_CLASS)
+      .appendTo($main);
+
+    // Add the first group to the toolbar
+    var $group = $(DIV_TAG)
+      .addClass(GROUP_CLASS)
+      .appendTo($toolbar);
+    
+    // Add the buttons to the toolbar
+    $.each(options.controls.split(" "), function(idx, buttonName) {
+      if (buttonName === "") return true;
+
+      // Divider
+      if (buttonName == "|") {
+
+        // Add a new divider to the group
+        var $div = $(DIV_TAG)
+          .addClass(DIVIDER_CLASS)
+          .appendTo($group);
+
+        // Create a new group
+        $group = $(DIV_TAG)
+          .addClass(GROUP_CLASS)
+          .appendTo($toolbar);
+
+      }
+
+      // Button
+      else {
+        
+        // Get the button definition
+        var button = buttons[buttonName];
+
+        // Add a new button to the group
+        var $buttonDiv = $(DIV_TAG)
+          .data(BUTTON_NAME, button.name)
+          .addClass(BUTTON_CLASS)
+          .attr("title", button.title)
+          .bind(CLICK, $.proxy(buttonClick, editor))
+          .appendTo($group)
+          .hover(hoverEnter, hoverLeave);
+
+        // Prepare the button image
+        var map = {};
+        if (button.css) map = button.css;
+        else if (button.image) map.backgroundImage = imageUrl(button.image);
+        if (button.stripIndex) map.backgroundPosition = button.stripIndex * -24;
+        $buttonDiv.css(map);
+
+        // Add the unselectable attribute for ie
+        if (ie)
+          $buttonDiv.attr(UNSELECTABLE, "on");
+
+        // Create the popup
+        if (button.popupName)
+          createPopup(button.popupName, options, button.popupClass,
+            button.popupContent, button.popupHover);
+        
+      }
+
+    });
+
+    // Add the main div to the DOM and append the textarea
+    $main.insertBefore($area)
+      .append($area);
+
+    // Bind the document click event handler
+    if (!documentClickAssigned) {
+      $(document).click(function(e) {
+        // Dismiss all non-prompt popups
+        var $target = $(e.target);
+        if (!$target.add($target.parents()).is("." + PROMPT_CLASS))
+          hidePopups();
+      });
+      documentClickAssigned = true;
+    }
+
+    // Bind the window resize event when the width or height is auto or %
+    if (/auto|%/.test("" + options.width + options.height))
+      $(window).resize(function() {refresh(editor);});
+
+    // Create the iframe and resize the controls
+    refresh(editor);
+
+  };
+
+  //===============
+  // Public Methods
+  //===============
+
+  var fn = cleditor.prototype,
+
+  // Expose the following private functions as methods on the cleditor object.
+  // The closure compiler will rename the private functions. However, the
+  // exposed method names on the cleditor object will remain fixed.
+  methods = [
+    ["clear", clear],
+    ["disable", disable],
+    ["execCommand", execCommand],
+    ["focus", focus],
+    ["hidePopups", hidePopups],
+    ["sourceMode", sourceMode, true],
+    ["refresh", refresh],
+    ["select", select],
+    ["selectedHTML", selectedHTML, true],
+    ["selectedText", selectedText, true],
+    ["showMessage", showMessage],
+    ["updateFrame", updateFrame],
+    ["updateTextArea", updateTextArea]
+  ];
+
+  $.each(methods, function(idx, method) {
+    fn[method[0]] = function() {
+      var editor = this, args = [editor];
+      // using each here would cast booleans into objects!
+      for(var x = 0; x < arguments.length; x++) {args.push(arguments[x]);}
+      var result = method[1].apply(editor, args);
+      if (method[2]) return result;
+      return editor;
+    };
+  });
+
+  // change - shortcut for .bind("change", handler) or .trigger("change")
+  fn.change = function(handler) {
+    var $this = $(this);
+    return handler ? $this.bind(CHANGE, handler) : $this.trigger(CHANGE);
+  };
+
+  //===============
+  // Event Handlers
+  //===============
+
+  // buttonClick - click event handler for toolbar buttons
+  function buttonClick(e) {
+
+    var editor = this,
+        buttonDiv = e.target,
+        buttonName = $.data(buttonDiv, BUTTON_NAME),
+        button = buttons[buttonName],
+        popupName = button.popupName,
+        popup = popups[popupName];
+
+    // Check if disabled
+    if (editor.disabled || $(buttonDiv).attr(DISABLED) == DISABLED)
+      return;
+
+    // Fire the buttonClick event
+    var data = {
+      editor: editor,
+      button: buttonDiv,
+      buttonName: buttonName,
+      popup: popup,
+      popupName: popupName,
+      command: button.command,
+      useCSS: editor.options.useCSS
+    };
+
+    if (button.buttonClick && button.buttonClick(e, data) === false)
+      return false;
+
+    // Toggle source
+    if (buttonName == "source") {
+
+      // Show the iframe
+      if (sourceMode(editor)) {
+        delete editor.range;
+        editor.$area.hide();
+        editor.$frame.show();
+        buttonDiv.title = button.title;
+      }
+
+      // Show the textarea
+      else {
+        editor.$frame.hide();
+        editor.$area.show();
+        buttonDiv.title = "Show Rich Text";
+      }
+
+      // Enable or disable the toolbar buttons
+      // IE requires the timeout
+      setTimeout(function() {refreshButtons(editor);}, 100);
+
+    }
+
+    // Check for rich text mode
+    else if (!sourceMode(editor)) {
+
+      // Handle popups
+      if (popupName) {
+        var $popup = $(popup);
+
+        // URL
+        if (popupName == "url") {
+
+          // Check for selection before showing the link url popup
+          if (buttonName == "link" && selectedText(editor) === "") {
+            showMessage(editor, "A selection is required when inserting a link.", buttonDiv);
+            return false;
+          }
+
+          // Wire up the submit button click event handler
+          $popup.children(":button")
+            .unbind(CLICK)
+            .bind(CLICK, function() {
+
+              // Insert the image or link if a url was entered
+              var $text = $popup.find(":text"),
+                url = $.trim($text.val());
+              if (url !== "")
+                execCommand(editor, data.command, url, null, data.button);
+
+              // Reset the text, hide the popup and set focus
+              $text.val("http://");
+              hidePopups();
+              focus(editor);
+
+            });
+
+        }
+
+        // Paste as Text
+        else if (popupName == "pastetext") {
+
+          // Wire up the submit button click event handler
+          $popup.children(":button")
+            .unbind(CLICK)
+            .bind(CLICK, function() {
+
+              // Insert the unformatted text replacing new lines with break tags
+              var $textarea = $popup.find("textarea"),
+                text = $textarea.val().replace(/\n/g, "<br />");
+              if (text !== "")
+                execCommand(editor, data.command, text, null, data.button);
+
+              // Reset the text, hide the popup and set focus
+              $textarea.val("");
+              hidePopups();
+              focus(editor);
+
+            });
+
+        }
+
+        // Show the popup if not already showing for this button
+        if (buttonDiv !== $.data(popup, BUTTON)) {
+          showPopup(editor, popup, buttonDiv);
+          return false; // stop propagination to document click
+        }
+
+        // propaginate to documnt click
+        return;
+
+      }
+
+      // Print
+      else if (buttonName == "print")
+        editor.$frame[0].contentWindow.print();
+
+      // All other buttons
+      else if (!execCommand(editor, data.command, data.value, data.useCSS, buttonDiv))
+        return false;
+
+    }
+
+    // Focus the editor
+    focus(editor);
+
+  }
+
+  // hoverEnter - mouseenter event handler for buttons and popup items
+  function hoverEnter(e) {
+    var $div = $(e.target).closest("div");
+    $div.css(BACKGROUND_COLOR, $div.data(BUTTON_NAME) ? "#FFF" : "#FFC");
+  }
+
+  // hoverLeave - mouseleave event handler for buttons and popup items
+  function hoverLeave(e) {
+    $(e.target).closest("div").css(BACKGROUND_COLOR, "transparent");
+  }
+
+  // popupClick - click event handler for popup items
+  function popupClick(e) {
+
+    var editor = this,
+        popup = e.data.popup,
+        target = e.target;
+
+    // Check for message and prompt popups
+    if (popup === popups.msg || $(popup).hasClass(PROMPT_CLASS))
+      return;
+
+    // Get the button info
+    var buttonDiv = $.data(popup, BUTTON),
+        buttonName = $.data(buttonDiv, BUTTON_NAME),
+        button = buttons[buttonName],
+        command = button.command,
+        value,
+        useCSS = editor.options.useCSS;
+
+    // Get the command value
+    if (buttonName == "font")
+      // Opera returns the fontfamily wrapped in quotes
+      value = target.style.fontFamily.replace(/"/g, "");
+    else if (buttonName == "size") {
+      if (target.tagName == "DIV")
+        target = target.children[0];
+      value = target.innerHTML;
+    }
+    else if (buttonName == "style")
+      value = "<" + target.tagName + ">";
+    else if (buttonName == "color")
+      value = hex(target.style.backgroundColor);
+    else if (buttonName == "highlight") {
+      value = hex(target.style.backgroundColor);
+      if (ie) command = 'backcolor';
+      else useCSS = true;
+    }
+
+    // Fire the popupClick event
+    var data = {
+      editor: editor,
+      button: buttonDiv,
+      buttonName: buttonName,
+      popup: popup,
+      popupName: button.popupName,
+      command: command,
+      value: value,
+      useCSS: useCSS
+    };
+
+    if (button.popupClick && button.popupClick(e, data) === false)
+      return;
+
+    // Execute the command
+    if (data.command && !execCommand(editor, data.command, data.value, data.useCSS, buttonDiv))
+      return false;
+
+    // Hide the popup and focus the editor
+    hidePopups();
+    focus(editor);
+
+  }
+
+  //==================
+  // Private Functions
+  //==================
+
+  // checksum - returns a checksum using the Adler-32 method
+  function checksum(text)
+  {
+    var a = 1, b = 0;
+    for (var index = 0; index < text.length; ++index) {
+      a = (a + text.charCodeAt(index)) % 65521;
+      b = (b + a) % 65521;
+    }
+    return (b << 16) | a;
+  }
+
+  // clear - clears the contents of the editor
+  function clear(editor) {
+    editor.$area.val("");
+    updateFrame(editor);
+  }
+
+  // createPopup - creates a popup and adds it to the body
+  function createPopup(popupName, options, popupTypeClass, popupContent, popupHover) {
+
+    // Check if popup already exists
+    if (popups[popupName])
+      return popups[popupName];
+
+    // Create the popup
+    var $popup = $(DIV_TAG)
+      .hide()
+      .addClass(POPUP_CLASS)
+      .appendTo("body");
+
+    // Add the content
+
+    // Custom popup
+    if (popupContent)
+      $popup.html(popupContent);
+
+    // Color
+    else if (popupName == "color") {
+      var colors = options.colors.split(" ");
+      if (colors.length < 10)
+        $popup.width("auto");
+      $.each(colors, function(idx, color) {
+        $(DIV_TAG).appendTo($popup)
+          .css(BACKGROUND_COLOR, "#" + color);
+      });
+      popupTypeClass = COLOR_CLASS;
+    }
+
+    // Font
+    else if (popupName == "font")
+      $.each(options.fonts.split(","), function(idx, font) {
+        $(DIV_TAG).appendTo($popup)
+          .css("fontFamily", font)
+          .html(font);
+      });
+
+    // Size
+    else if (popupName == "size")
+      $.each(options.sizes.split(","), function(idx, size) {
+        $(DIV_TAG).appendTo($popup)
+          .html("<font size=" + size + ">" + size + "</font>");
+      });
+
+    // Style
+    else if (popupName == "style")
+      $.each(options.styles, function(idx, style) {
+        $(DIV_TAG).appendTo($popup)
+          .html(style[1] + style[0] + style[1].replace("<", "</"));
+      });
+
+    // URL
+    else if (popupName == "url") {
+      $popup.html('Enter URL:<br><input type=text value="http://" size=35><br><input type=button value="Submit">');
+      popupTypeClass = PROMPT_CLASS;
+    }
+
+    // Paste as Text
+    else if (popupName == "pastetext") {
+      $popup.html('Paste your content here and click submit.<br /><textarea cols=40 rows=3></textarea><br /><input type=button value=Submit>');
+      popupTypeClass = PROMPT_CLASS;
+    }
+
+    // Add the popup type class name
+    if (!popupTypeClass && !popupContent)
+      popupTypeClass = LIST_CLASS;
+    $popup.addClass(popupTypeClass);
+
+    // Add the unselectable attribute to all items
+    if (ie) {
+      $popup.attr(UNSELECTABLE, "on")
+        .find("div,font,p,h1,h2,h3,h4,h5,h6")
+        .attr(UNSELECTABLE, "on");
+    }
+
+    // Add the hover effect to all items
+    if ($popup.hasClass(LIST_CLASS) || popupHover === true)
+      $popup.children().hover(hoverEnter, hoverLeave);
+
+    // Add the popup to the array and return it
+    popups[popupName] = $popup[0];
+    return $popup[0];
+
+  }
+
+  // disable - enables or disables the editor
+  function disable(editor, disabled) {
+
+    // Update the textarea and save the state
+    if (disabled) {
+      editor.$area.attr(DISABLED, DISABLED);
+      editor.disabled = true;
+    }
+    else {
+      editor.$area.removeAttr(DISABLED);
+      delete editor.disabled;
+    }
+
+    // Switch the iframe into design mode.
+    // ie6 does not support designMode.
+    // ie7 & ie8 do not properly support designMode="off".
+    try {
+      if (ie) editor.doc.body.contentEditable = !disabled;
+      else editor.doc.designMode = !disabled ? "on" : "off";
+    }
+    // Firefox 1.5 throws an exception that can be ignored
+    // when toggling designMode from off to on.
+    catch (err) {}
+
+    // Enable or disable the toolbar buttons
+    refreshButtons(editor);
+
+  }
+
+  // execCommand - executes a designMode command
+  function execCommand(editor, command, value, useCSS, button) {
+
+    // Restore the current ie selection
+    restoreRange(editor);
+
+    // Set the styling method
+    if (!ie) {
+      if (useCSS === undefined || useCSS === null)
+        useCSS = editor.options.useCSS;
+      editor.doc.execCommand("styleWithCSS", 0, useCSS.toString());
+    }
+
+    // Execute the command and check for error
+    var success = true, description;
+    if (ie && command.toLowerCase() == "inserthtml")
+      getRange(editor).pasteHTML(value);
+    else {
+      try { success = editor.doc.execCommand(command, 0, value || null); }
+      catch (err) { description = err.description; success = false; }
+      if (!success) {
+        if ("cutcopypaste".indexOf(command) > -1)
+          showMessage(editor, "For security reasons, your browser does not support the " +
+            command + " command. Try using the keyboard shortcut or context menu instead.",
+            button);
+        else
+          showMessage(editor,
+            (description ? description : "Error executing the " + command + " command."),
+            button);
+      }
+    }
+
+    // Enable the buttons
+    refreshButtons(editor);
+    return success;
+
+  }
+
+  // focus - sets focus to either the textarea or iframe
+  function focus(editor) {
+    setTimeout(function() {
+      if (sourceMode(editor)) editor.$area.focus();
+      else editor.$frame[0].contentWindow.focus();
+      refreshButtons(editor);
+    }, 0);
+  }
+
+  // getRange - gets the current text range object
+  function getRange(editor) {
+    if (ie) return getSelection(editor).createRange();
+    return getSelection(editor).getRangeAt(0);
+  }
+
+  // getSelection - gets the current text range object
+  function getSelection(editor) {
+    if (ie) return editor.doc.selection;
+    return editor.$frame[0].contentWindow.getSelection();
+  }
+
+  // Returns the hex value for the passed in string.
+  //   hex("rgb(255, 0, 0)"); // #FF0000
+  //   hex("#FF0000"); // #FF0000
+  //   hex("#F00"); // #FF0000
+  function hex(s) {
+    var m = /rgba?\((\d+), (\d+), (\d+)/.exec(s),
+      c = s.split("");
+    if (m) {
+      s = ( m[1] << 16 | m[2] << 8 | m[3] ).toString(16);
+      while (s.length < 6)
+        s = "0" + s;
+    }
+    return "#" + (s.length == 6 ? s : c[1] + c[1] + c[2] + c[2] + c[3] + c[3]);
+  }
+
+  // hidePopups - hides all popups
+  function hidePopups() {
+    $.each(popups, function(idx, popup) {
+      $(popup)
+        .hide()
+        .unbind(CLICK)
+        .removeData(BUTTON);
+    });
+  }
+
+  // imagesPath - returns the path to the images folder
+  function imagesPath() {
+    var cssFile = "jquery.cleditor.css",
+        href = $("link[href$='" + cssFile +"']").attr("href");
+    return href.substr(0, href.length - cssFile.length) + "images/";
+  }
+
+  // imageUrl - Returns the css url string for a filemane
+  function imageUrl(filename) {
+    return "url(" + imagesPath() + filename + ")";
+  }
+
+  // refresh - creates the iframe and resizes the controls
+  function refresh(editor) {
+
+    var $main = editor.$main,
+      options = editor.options;
+
+    // Remove the old iframe
+    if (editor.$frame) 
+      editor.$frame.remove();
+
+    // Create a new iframe
+    var $frame = editor.$frame = $('<iframe frameborder="0" src="javascript:true;">')
+      .hide()
+      .appendTo($main);
+
+    // Load the iframe document content
+    var contentWindow = $frame[0].contentWindow,
+      doc = editor.doc = contentWindow.document,
+      $doc = $(doc);
+
+    doc.open();
+    doc.write(
+      options.docType +
+      '<html>' +
+      ((options.docCSSFile === '') ? '' : '<head><link rel="stylesheet" type="text/css" href="' + options.docCSSFile + '" /></head>') +
+      '<body style="' + options.bodyStyle + '"></body></html>'
+    );
+    doc.close();
+
+    // Work around for bug in IE which causes the editor to lose
+    // focus when clicking below the end of the document.
+    if (ie)
+      $doc.click(function() {focus(editor);});
+
+    // Load the content
+    updateFrame(editor);
+
+    // Bind the ie specific iframe event handlers
+    if (ie) {
+
+      // Save the current user selection. This code is needed since IE will
+      // reset the selection just after the beforedeactivate event and just
+      // before the beforeactivate event.
+      $doc.bind("beforedeactivate beforeactivate selectionchange keypress", function(e) {
+        
+        // Flag the editor as inactive
+        if (e.type == "beforedeactivate")
+          editor.inactive = true;
+        
+        // Get rid of the bogus selection and flag the editor as active
+        else if (e.type == "beforeactivate") {
+          if (!editor.inactive && editor.range && editor.range.length > 1)
+            editor.range.shift();
+          delete editor.inactive;
+        }
+
+        // Save the selection when the editor is active
+        else if (!editor.inactive) {
+          if (!editor.range) 
+            editor.range = [];
+          editor.range.unshift(getRange(editor));
+
+          // We only need the last 2 selections
+          while (editor.range.length > 2)
+            editor.range.pop();
+        }
+
+      });
+
+      // Restore the text range when the iframe gains focus
+      $frame.focus(function() {
+        restoreRange(editor);
+      });
+
+    }
+
+    // Update the textarea when the iframe loses focus
+    ($.browser.mozilla ? $doc : $(contentWindow)).blur(function() {
+      updateTextArea(editor, true);
+    });
+
+    // Enable the toolbar buttons as the user types or clicks
+    $doc.click(hidePopups)
+      .bind("keyup mouseup", function() {
+        refreshButtons(editor);
+      });
+
+    // Show the textarea for iPhone/iTouch/iPad or
+    // the iframe when design mode is supported.
+    if (iOS) editor.$area.show();
+    else $frame.show();
+
+    // Wait for the layout to finish - shortcut for $(document).ready()
+    $(function() {
+
+      var $toolbar = editor.$toolbar,
+          $group = $toolbar.children("div:last"),
+          wid = $main.width();
+
+      // Resize the toolbar
+      var hgt = $group.offset().top + $group.outerHeight() - $toolbar.offset().top + 1;
+      $toolbar.height(hgt);
+
+      // Resize the iframe
+      hgt = (/%/.test("" + options.height) ? $main.height() : parseInt(options.height)) - hgt;
+      $frame.width(wid).height(hgt);
+
+      // Resize the textarea. IE6 textareas have a 1px top
+      // & bottom margin that cannot be removed using css.
+      editor.$area.width(wid).height(ie6 ? hgt - 2 : hgt);
+
+      // Switch the iframe into design mode if enabled
+      disable(editor, editor.disabled);
+
+      // Enable or disable the toolbar buttons
+      refreshButtons(editor);
+
+    });
+
+  }
+
+  // refreshButtons - enables or disables buttons based on availability
+  function refreshButtons(editor) {
+
+    // Webkit requires focus before queryCommandEnabled will return anything but false
+    if (!iOS && $.browser.webkit && !editor.focused) {
+      editor.$frame[0].contentWindow.focus();
+      window.focus();
+      editor.focused = true;
+    }
+
+    // Get the object used for checking queryCommandEnabled
+    var queryObj = editor.doc;
+    if (ie) queryObj = getRange(editor);
+
+    // Loop through each button
+    var inSourceMode = sourceMode(editor);
+    $.each(editor.$toolbar.find("." + BUTTON_CLASS), function(idx, elem) {
+
+      var $elem = $(elem),
+        button = $.cleditor.buttons[$.data(elem, BUTTON_NAME)],
+        command = button.command,
+        enabled = true;
+
+      // Determine the state
+      if (editor.disabled)
+        enabled = false;
+      else if (button.getEnabled) {
+        var data = {
+          editor: editor,
+          button: elem,
+          buttonName: button.name,
+          popup: popups[button.popupName],
+          popupName: button.popupName,
+          command: button.command,
+          useCSS: editor.options.useCSS
+        };
+        enabled = button.getEnabled(data);
+        if (enabled === undefined)
+          enabled = true;
+      }
+      else if (((inSourceMode || iOS) && button.name != "source") ||
+      (ie && (command == "undo" || command == "redo")))
+        enabled = false;
+      else if (command && command != "print") {
+        if (ie && command == "hilitecolor")
+          command = "backcolor";
+        // IE does not support inserthtml, so it's always enabled
+        if (!ie || command != "inserthtml") {
+          try {enabled = queryObj.queryCommandEnabled(command);}
+          catch (err) {enabled = false;}
+        }
+      }
+
+      // Enable or disable the button
+      if (enabled) {
+        $elem.removeClass(DISABLED_CLASS);
+        $elem.removeAttr(DISABLED);
+      }
+      else {
+        $elem.addClass(DISABLED_CLASS);
+        $elem.attr(DISABLED, DISABLED);
+      }
+
+    });
+  }
+
+  // restoreRange - restores the current ie selection
+  function restoreRange(editor) {
+    if (ie && editor.range)
+      editor.range[0].select();
+  }
+
+  // select - selects all the text in either the textarea or iframe
+  function select(editor) {
+    setTimeout(function() {
+      if (sourceMode(editor)) editor.$area.select();
+      else execCommand(editor, "selectall");
+    }, 0);
+  }
+
+  // selectedHTML - returns the current HTML selection or and empty string
+  function selectedHTML(editor) {
+    restoreRange(editor);
+    var range = getRange(editor);
+    if (ie)
+      return range.htmlText;
+    var layer = $("<layer>")[0];
+    layer.appendChild(range.cloneContents());
+    var html = layer.innerHTML;
+    layer = null;
+    return html;
+  }
+
+  // selectedText - returns the current text selection or and empty string
+  function selectedText(editor) {
+    restoreRange(editor);
+    if (ie) return getRange(editor).text;
+    return getSelection(editor).toString();
+  }
+
+  // showMessage - alert replacement
+  function showMessage(editor, message, button) {
+    var popup = createPopup("msg", editor.options, MSG_CLASS);
+    popup.innerHTML = message;
+    showPopup(editor, popup, button);
+  }
+
+  // showPopup - shows a popup
+  function showPopup(editor, popup, button) {
+
+    var offset, left, top, $popup = $(popup);
+
+    // Determine the popup location
+    if (button) {
+      var $button = $(button);
+      offset = $button.offset();
+      left = --offset.left;
+      top = offset.top + $button.height();
+    }
+    else {
+      var $toolbar = editor.$toolbar;
+      offset = $toolbar.offset();
+      left = Math.floor(($toolbar.width() - $popup.width()) / 2) + offset.left;
+      top = offset.top + $toolbar.height() - 2;
+    }
+
+    // Position and show the popup
+    hidePopups();
+    $popup.css({left: left, top: top})
+      .show();
+
+    // Assign the popup button and click event handler
+    if (button) {
+      $.data(popup, BUTTON, button);
+      $popup.bind(CLICK, {popup: popup}, $.proxy(popupClick, editor));
+    }
+
+    // Focus the first input element if any
+    setTimeout(function() {
+      $popup.find(":text,textarea").eq(0).focus().select();
+    }, 100);
+
+  }
+
+  // sourceMode - returns true if the textarea is showing
+  function sourceMode(editor) {
+    return editor.$area.is(":visible");
+  }
+
+  // updateFrame - updates the iframe with the textarea contents
+  function updateFrame(editor, checkForChange) {
+    
+    var code = editor.$area.val(),
+      options = editor.options,
+      updateFrameCallback = options.updateFrame,
+      $body = $(editor.doc.body);
+
+    // Check for textarea change to avoid unnecessary firing
+    // of potentially heavy updateFrame callbacks.
+    if (updateFrameCallback) {
+      var sum = checksum(code);
+      if (checkForChange && editor.areaChecksum == sum)
+        return;
+      editor.areaChecksum = sum;
+    }
+
+    // Convert the textarea source code into iframe html
+    var html = updateFrameCallback ? updateFrameCallback(code) : code;
+
+    // Prevent script injection attacks by html encoding script tags
+    html = html.replace(/<(?=\/?script)/ig, "&lt;");
+
+    // Update the iframe checksum
+    if (options.updateTextArea)
+      editor.frameChecksum = checksum(html);
+
+    // Update the iframe and trigger the change event
+    if (html != $body.html()) {
+      $body.html(html);
+      $(editor).triggerHandler(CHANGE);
+    }
+
+  }
+
+  // updateTextArea - updates the textarea with the iframe contents
+  function updateTextArea(editor, checkForChange) {
+
+    var html = $(editor.doc.body).html(),
+      options = editor.options,
+      updateTextAreaCallback = options.updateTextArea,
+      $area = editor.$area;
+
+    // Check for iframe change to avoid unnecessary firing
+    // of potentially heavy updateTextArea callbacks.
+    if (updateTextAreaCallback) {
+      var sum = checksum(html);
+      if (checkForChange && editor.frameChecksum == sum)
+        return;
+      editor.frameChecksum = sum;
+    }
+
+    // Convert the iframe html into textarea source code
+    var code = updateTextAreaCallback ? updateTextAreaCallback(html) : html;
+
+    // Update the textarea checksum
+    if (options.updateFrame)
+      editor.areaChecksum = checksum(code);
+
+    // Update the textarea and trigger the change event
+    if (code != $area.val()) {
+      $area.val(code);
+      $(editor).triggerHandler(CHANGE);
+    }
+
+  }
+
+})(jQuery);
diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.min.js b/addons/web/static/lib/cleditor/jquery.cleditor.min.js
new file mode 100644
index 00000000000..5afec048867
--- /dev/null
+++ b/addons/web/static/lib/cleditor/jquery.cleditor.min.js
@@ -0,0 +1,31 @@
+/*
+ CLEditor WYSIWYG HTML Editor v1.3.0
+ http://premiumsoftware.net/cleditor
+ requires jQuery v1.4.2 or later
+
+ Copyright 2010, Chris Landowski, Premium Software, LLC
+ Dual licensed under the MIT or GPL Version 2 licenses.
+*/
+(function(e){function aa(a){var b=this,c=a.target,d=e.data(c,x),h=s[d],f=h.popupName,i=p[f];if(!(b.disabled||e(c).attr(n)==n)){var g={editor:b,button:c,buttonName:d,popup:i,popupName:f,command:h.command,useCSS:b.options.useCSS};if(h.buttonClick&&h.buttonClick(a,g)===false)return false;if(d=="source"){if(t(b)){delete b.range;b.$area.hide();b.$frame.show();c.title=h.title}else{b.$frame.hide();b.$area.show();c.title="Show Rich Text"}setTimeout(function(){u(b)},100)}else if(!t(b))if(f){var j=e(i);if(f==
+"url"){if(d=="link"&&M(b)===""){z(b,"A selection is required when inserting a link.",c);return false}j.children(":button").unbind(q).bind(q,function(){var k=j.find(":text"),o=e.trim(k.val());o!==""&&v(b,g.command,o,null,g.button);k.val("http://");r();w(b)})}else f=="pastetext"&&j.children(":button").unbind(q).bind(q,function(){var k=j.find("textarea"),o=k.val().replace(/\n/g,"<br />");o!==""&&v(b,g.command,o,null,g.button);k.val("");r();w(b)});if(c!==e.data(i,A)){N(b,i,c);return false}return}else if(d==
+"print")b.$frame[0].contentWindow.print();else if(!v(b,g.command,g.value,g.useCSS,c))return false;w(b)}}function O(a){a=e(a.target).closest("div");a.css(H,a.data(x)?"#FFF":"#FFC")}function P(a){e(a.target).closest("div").css(H,"transparent")}function ba(a){var b=a.data.popup,c=a.target;if(!(b===p.msg||e(b).hasClass(B))){var d=e.data(b,A),h=e.data(d,x),f=s[h],i=f.command,g,j=this.options.useCSS;if(h=="font")g=c.style.fontFamily.replace(/"/g,"");else if(h=="size"){if(c.tagName=="DIV")c=c.children[0];
+g=c.innerHTML}else if(h=="style")g="<"+c.tagName+">";else if(h=="color")g=Q(c.style.backgroundColor);else if(h=="highlight"){g=Q(c.style.backgroundColor);if(l)i="backcolor";else j=true}b={editor:this,button:d,buttonName:h,popup:b,popupName:f.popupName,command:i,value:g,useCSS:j};if(!(f.popupClick&&f.popupClick(a,b)===false)){if(b.command&&!v(this,b.command,b.value,b.useCSS,d))return false;r();w(this)}}}function C(a){for(var b=1,c=0,d=0;d<a.length;++d){b=(b+a.charCodeAt(d))%65521;c=(c+b)%65521}return c<<
+16|b}function R(a,b,c,d,h){if(p[a])return p[a];var f=e(m).hide().addClass(ca).appendTo("body");if(d)f.html(d);else if(a=="color"){b=b.colors.split(" ");b.length<10&&f.width("auto");e.each(b,function(i,g){e(m).appendTo(f).css(H,"#"+g)});c=da}else if(a=="font")e.each(b.fonts.split(","),function(i,g){e(m).appendTo(f).css("fontFamily",g).html(g)});else if(a=="size")e.each(b.sizes.split(","),function(i,g){e(m).appendTo(f).html("<font size="+g+">"+g+"</font>")});else if(a=="style")e.each(b.styles,function(i,
+g){e(m).appendTo(f).html(g[1]+g[0]+g[1].replace("<","</"))});else if(a=="url"){f.html('Enter URL:<br><input type=text value="http://" size=35><br><input type=button value="Submit">');c=B}else if(a=="pastetext"){f.html("Paste your content here and click submit.<br /><textarea cols=40 rows=3></textarea><br /><input type=button value=Submit>");c=B}if(!c&&!d)c=S;f.addClass(c);l&&f.attr(I,"on").find("div,font,p,h1,h2,h3,h4,h5,h6").attr(I,"on");if(f.hasClass(S)||h===true)f.children().hover(O,P);p[a]=f[0];
+return f[0]}function T(a,b){if(b){a.$area.attr(n,n);a.disabled=true}else{a.$area.removeAttr(n);delete a.disabled}try{if(l)a.doc.body.contentEditable=!b;else a.doc.designMode=!b?"on":"off"}catch(c){}u(a)}function v(a,b,c,d,h){D(a);if(!l){if(d===undefined||d===null)d=a.options.useCSS;a.doc.execCommand("styleWithCSS",0,d.toString())}d=true;var f;if(l&&b.toLowerCase()=="inserthtml")y(a).pasteHTML(c);else{try{d=a.doc.execCommand(b,0,c||null)}catch(i){f=i.description;d=false}d||("cutcopypaste".indexOf(b)>
+-1?z(a,"For security reasons, your browser does not support the "+b+" command. Try using the keyboard shortcut or context menu instead.",h):z(a,f?f:"Error executing the "+b+" command.",h))}u(a);return d}function w(a){setTimeout(function(){t(a)?a.$area.focus():a.$frame[0].contentWindow.focus();u(a)},0)}function y(a){if(l)return J(a).createRange();return J(a).getRangeAt(0)}function J(a){if(l)return a.doc.selection;return a.$frame[0].contentWindow.getSelection()}function Q(a){var b=/rgba?\((\d+), (\d+), (\d+)/.exec(a),
+c=a.split("");if(b)for(a=(b[1]<<16|b[2]<<8|b[3]).toString(16);a.length<6;)a="0"+a;return"#"+(a.length==6?a:c[1]+c[1]+c[2]+c[2]+c[3]+c[3])}function r(){e.each(p,function(a,b){e(b).hide().unbind(q).removeData(A)})}function U(){var a=e("link[href$='jquery.cleditor.css']").attr("href");return a.substr(0,a.length-19)+"images/"}function K(a){var b=a.$main,c=a.options;a.$frame&&a.$frame.remove();var d=a.$frame=e('<iframe frameborder="0" src="javascript:true;">').hide().appendTo(b),h=d[0].contentWindow,f=
+a.doc=h.document,i=e(f);f.open();f.write(c.docType+"<html>"+(c.docCSSFile===""?"":'<head><link rel="stylesheet" type="text/css" href="'+c.docCSSFile+'" /></head>')+'<body style="'+c.bodyStyle+'"></body></html>');f.close();l&&i.click(function(){w(a)});E(a);if(l){i.bind("beforedeactivate beforeactivate selectionchange keypress",function(g){if(g.type=="beforedeactivate")a.inactive=true;else if(g.type=="beforeactivate"){!a.inactive&&a.range&&a.range.length>1&&a.range.shift();delete a.inactive}else if(!a.inactive){if(!a.range)a.range=
+[];for(a.range.unshift(y(a));a.range.length>2;)a.range.pop()}});d.focus(function(){D(a)})}(e.browser.mozilla?i:e(h)).blur(function(){V(a,true)});i.click(r).bind("keyup mouseup",function(){u(a)});L?a.$area.show():d.show();e(function(){var g=a.$toolbar,j=g.children("div:last"),k=b.width();j=j.offset().top+j.outerHeight()-g.offset().top+1;g.height(j);j=(/%/.test(""+c.height)?b.height():parseInt(c.height))-j;d.width(k).height(j);a.$area.width(k).height(ea?j-2:j);T(a,a.disabled);u(a)})}function u(a){if(!L&&
+e.browser.webkit&&!a.focused){a.$frame[0].contentWindow.focus();window.focus();a.focused=true}var b=a.doc;if(l)b=y(a);var c=t(a);e.each(a.$toolbar.find("."+W),function(d,h){var f=e(h),i=e.cleditor.buttons[e.data(h,x)],g=i.command,j=true;if(a.disabled)j=false;else if(i.getEnabled){j=i.getEnabled({editor:a,button:h,buttonName:i.name,popup:p[i.popupName],popupName:i.popupName,command:i.command,useCSS:a.options.useCSS});if(j===undefined)j=true}else if((c||L)&&i.name!="source"||l&&(g=="undo"||g=="redo"))j=
+false;else if(g&&g!="print"){if(l&&g=="hilitecolor")g="backcolor";if(!l||g!="inserthtml")try{j=b.queryCommandEnabled(g)}catch(k){j=false}}if(j){f.removeClass(X);f.removeAttr(n)}else{f.addClass(X);f.attr(n,n)}})}function D(a){l&&a.range&&a.range[0].select()}function M(a){D(a);if(l)return y(a).text;return J(a).toString()}function z(a,b,c){var d=R("msg",a.options,fa);d.innerHTML=b;N(a,d,c)}function N(a,b,c){var d,h,f=e(b);if(c){var i=e(c);d=i.offset();h=--d.left;d=d.top+i.height()}else{i=a.$toolbar;
+d=i.offset();h=Math.floor((i.width()-f.width())/2)+d.left;d=d.top+i.height()-2}r();f.css({left:h,top:d}).show();if(c){e.data(b,A,c);f.bind(q,{popup:b},e.proxy(ba,a))}setTimeout(function(){f.find(":text,textarea").eq(0).focus().select()},100)}function t(a){return a.$area.is(":visible")}function E(a,b){var c=a.$area.val(),d=a.options,h=d.updateFrame,f=e(a.doc.body);if(h){var i=C(c);if(b&&a.areaChecksum==i)return;a.areaChecksum=i}c=h?h(c):c;c=c.replace(/<(?=\/?script)/ig,"&lt;");if(d.updateTextArea)a.frameChecksum=
+C(c);if(c!=f.html()){f.html(c);e(a).triggerHandler(F)}}function V(a,b){var c=e(a.doc.body).html(),d=a.options,h=d.updateTextArea,f=a.$area;if(h){var i=C(c);if(b&&a.frameChecksum==i)return;a.frameChecksum=i}c=h?h(c):c;if(d.updateFrame)a.areaChecksum=C(c);if(c!=f.val()){f.val(c);e(a).triggerHandler(F)}}e.cleditor={defaultOptions:{width:500,height:250,controls:"bold italic underline strikethrough subscript superscript | font size style | color highlight removeformat | bullets numbering | outdent indent | alignleft center alignright justify | undo redo | rule image link unlink | cut copy paste pastetext | print source",
+colors:"FFF FCC FC9 FF9 FFC 9F9 9FF CFF CCF FCF CCC F66 F96 FF6 FF3 6F9 3FF 6FF 99F F9F BBB F00 F90 FC6 FF0 3F3 6CC 3CF 66C C6C 999 C00 F60 FC3 FC0 3C0 0CC 36F 63F C3C 666 900 C60 C93 990 090 399 33F 60C 939 333 600 930 963 660 060 366 009 339 636 000 300 630 633 330 030 033 006 309 303",fonts:"Arial,Arial Black,Comic Sans MS,Courier New,Narrow,Garamond,Georgia,Impact,Sans Serif,Serif,Tahoma,Trebuchet MS,Verdana",sizes:"1,2,3,4,5,6,7",styles:[["Paragraph","<p>"],["Header 1","<h1>"],["Header 2","<h2>"],
+["Header 3","<h3>"],["Header 4","<h4>"],["Header 5","<h5>"],["Header 6","<h6>"]],useCSS:false,docType:'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',docCSSFile:"",bodyStyle:"margin:4px; font:10pt Arial,Verdana; cursor:text"},buttons:{init:"bold,,|italic,,|underline,,|strikethrough,,|subscript,,|superscript,,|font,,fontname,|size,Font Size,fontsize,|style,,formatblock,|color,Font Color,forecolor,|highlight,Text Highlight Color,hilitecolor,color|removeformat,Remove Formatting,|bullets,,insertunorderedlist|numbering,,insertorderedlist|outdent,,|indent,,|alignleft,Align Text Left,justifyleft|center,,justifycenter|alignright,Align Text Right,justifyright|justify,,justifyfull|undo,,|redo,,|rule,Insert Horizontal Rule,inserthorizontalrule|image,Insert Image,insertimage,url|link,Insert Hyperlink,createlink,url|unlink,Remove Hyperlink,|cut,,|copy,,|paste,,|pastetext,Paste as Text,inserthtml,|print,,|source,Show Source"},
+imagesPath:function(){return U()}};e.fn.cleditor=function(a){var b=e([]);this.each(function(c,d){if(d.tagName=="TEXTAREA"){var h=e.data(d,Y);h||(h=new cleditor(d,a));b=b.add(h)}});return b};var H="backgroundColor",A="button",x="buttonName",F="change",Y="cleditor",q="click",n="disabled",m="<div>",I="unselectable",W="cleditorButton",X="cleditorDisabled",ca="cleditorPopup",S="cleditorList",da="cleditorColor",B="cleditorPrompt",fa="cleditorMsg",l=e.browser.msie,ea=/msie\s6/i.test(navigator.userAgent),
+L=/iphone|ipad|ipod/i.test(navigator.userAgent),p={},Z,s=e.cleditor.buttons;e.each(s.init.split("|"),function(a,b){var c=b.split(","),d=c[0];s[d]={stripIndex:a,name:d,title:c[1]===""?d.charAt(0).toUpperCase()+d.substr(1):c[1],command:c[2]===""?d:c[2],popupName:c[3]===""?d:c[3]}});delete s.init;cleditor=function(a,b){var c=this;c.options=b=e.extend({},e.cleditor.defaultOptions,b);var d=c.$area=e(a).hide().data(Y,c).blur(function(){E(c,true)}),h=c.$main=e(m).addClass("cleditorMain").width(b.width).height(b.height),
+f=c.$toolbar=e(m).addClass("cleditorToolbar").appendTo(h),i=e(m).addClass("cleditorGroup").appendTo(f);e.each(b.controls.split(" "),function(g,j){if(j==="")return true;if(j=="|"){e(m).addClass("cleditorDivider").appendTo(i);i=e(m).addClass("cleditorGroup").appendTo(f)}else{var k=s[j],o=e(m).data(x,k.name).addClass(W).attr("title",k.title).bind(q,e.proxy(aa,c)).appendTo(i).hover(O,P),G={};if(k.css)G=k.css;else if(k.image)G.backgroundImage="url("+U()+k.image+")";if(k.stripIndex)G.backgroundPosition=
+k.stripIndex*-24;o.css(G);l&&o.attr(I,"on");k.popupName&&R(k.popupName,b,k.popupClass,k.popupContent,k.popupHover)}});h.insertBefore(d).append(d);if(!Z){e(document).click(function(g){g=e(g.target);g.add(g.parents()).is("."+B)||r()});Z=true}/auto|%/.test(""+b.width+b.height)&&e(window).resize(function(){K(c)});K(c)};var $=cleditor.prototype;e.each([["clear",function(a){a.$area.val("");E(a)}],["disable",T],["execCommand",v],["focus",w],["hidePopups",r],["sourceMode",t,true],["refresh",K],["select",
+function(a){setTimeout(function(){t(a)?a.$area.select():v(a,"selectall")},0)}],["selectedHTML",function(a){D(a);a=y(a);if(l)return a.htmlText;var b=e("<layer>")[0];b.appendChild(a.cloneContents());return b.innerHTML},true],["selectedText",M,true],["showMessage",z],["updateFrame",E],["updateTextArea",V]],function(a,b){$[b[0]]=function(){for(var c=[this],d=0;d<arguments.length;d++)c.push(arguments[d]);c=b[1].apply(this,c);if(b[2])return c;return this}});$.change=function(a){var b=e(this);return a?b.bind(F,
+a):b.trigger(F)}})(jQuery);
\ No newline at end of file

From f0e50ce71cf1fcb9612c7cdc0daca3965223787e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 16:35:20 +0200
Subject: [PATCH 089/397] [ADD] Added text_html / FieldTextHtml widget.
 Basically, it is a FieldText widget with the CLEditor added on the textarea.
 Some customization work will have to be done though.

bzr revid: tde@openerp.com-20120615143520-irw7ougo19c0fvi8
---
 addons/web/static/src/js/view_form.js | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index aba31d64434..5ee4310f8a8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2209,6 +2209,36 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
     },
 }));
 
+/**
+ * FieldTextHtml Widget
+ * Intended for FieldText widgets meant to display HTML content. This
+ * widget will instantiate the CLEditor (see cleditor in static/src/lib)
+ * To find more information about CLEditor configutation: go to
+ * http://premiumsoftware.net/cleditor/docs/GettingStarted.html
+ */
+instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
+
+    set_value: function(value_) {
+        this._super.apply(this, arguments);
+        console.log(this.$element);
+        var textarea_node = this.$element.find('textarea.field_text');
+        textarea_node.cleditor({
+          //width:        500, // width not including margins, borders or padding
+          //height:       250, // height not including margins, borders or padding
+          controls:     // controls to add to the toolbar
+                        "bold italic underline strikethrough | size " +
+                        "| removeformat | bullets numbering | outdent " +
+                        "indent | " +
+                        "link unlink | source",  
+          sizes:        // sizes in the font size popup
+                        "1,2,3,4,5,6,7",
+          useCSS:       false, // use CSS to style HTML when possible (not supported in ie)
+          bodyStyle:    // style to assign to document body contained within the editor
+                        "margin:4px; font:13px monospace; cursor:text"
+        });
+    },
+});
+
 instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
     template: 'FieldBoolean',
     start: function() {
@@ -4287,6 +4317,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'email' : 'instance.web.form.FieldEmail',
     'url' : 'instance.web.form.FieldUrl',
     'text' : 'instance.web.form.FieldText',
+    'text_html' : 'instance.web.form.FieldTextHtml',
     'date' : 'instance.web.form.FieldDate',
     'datetime' : 'instance.web.form.FieldDatetime',
     'selection' : 'instance.web.form.FieldSelection',

From 1d782e80e5092366cceb7831fea51365d039856c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 16:35:44 +0200
Subject: [PATCH 090/397] [FIX] Fixed __openerp__ js file order, to prevent a
 bug with cleditor not knowing about jquery.

bzr revid: tde@openerp.com-20120615143544-akc1tr1z4bihe53x
---
 addons/web/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 53fe4dbb0b3..d84f6799726 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -10,7 +10,6 @@
     'auto_install': True,
     'post_load' : 'wsgi_postload',
     'js' : [
-        "static/lib/cleditor/jquery.cleditor.min.js",
         "static/lib/datejs/globalization/en-US.js",
         "static/lib/datejs/core.js",
         "static/lib/datejs/parser.js",
@@ -36,6 +35,7 @@
         "static/lib/underscore/underscore.js",
         "static/lib/underscore/underscore.string.js",
         "static/lib/backbone/backbone.js",
+        "static/lib/cleditor/jquery.cleditor.min.js",
 
         "static/lib/labjs/LAB.src.js",
         "static/lib/py.js/lib/py.js",
@@ -57,7 +57,6 @@
         "static/src/js/view_editor.js"
     ],
     'css' : [
-        "static/lib/cleditor/jquery.cleditor.css",
         "static/lib/jquery.superfish/css/superfish.css",
         "static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css",
         "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css",
@@ -67,6 +66,7 @@
         "static/src/css/base.css",
         "static/src/css/data_export.css",
         "static/src/css/data_import.css",
+        "static/lib/cleditor/jquery.cleditor.css",
     ],
     'qweb' : [
         "static/src/xml/*.xml",

From a7c3132d787abc66327cda2ce7f5e5c14b533722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 17:35:15 +0200
Subject: [PATCH 091/397] [IMP] chatter widget: some work on the compose
 message form (with now some javascript to show/hide advanced options).

bzr revid: tde@openerp.com-20120615153515-cicbz4m8kxsx5q53
---
 addons/mail/static/src/js/mail.js             | 24 +++++++++++++------
 .../mail/wizard/mail_compose_message_view.xml | 16 ++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3e820bc7e67..ba5315ea544 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -62,22 +62,32 @@ openerp.mail = function(session) {
             var main_node = this.$element;
             
             return $.when(this.form_view.appendTo(main_node)).pipe(function() {
+                self.bind_events();
                 self.form_view.do_show();
-                //self.form_view.on_button_cancel = function() {
-                    //console.log('cacaprout');
-                //};
+            });
+        },
+        
+        /**
+         * Bind events in the widget. Each event is slighty described
+         * in the function. */
+        bind_events: function() {
+            var self = this;
+            // event: click on 'Send a Message' link that toggles the
+            // advanced options for writing a message
+            this.$element.find('a.mail_compose_message_toggle').click(function (event) {
+                event.preventDefault();
+                self.$element.find('span.mail_compose_message_subject').toggle();
+                self.$element.find('div.mail_compose_message_body_html').toggle();
+                self.$element.find('div.mail_compose_message_partner_ids').toggle();
             });
         },
         
         destroy: function(parent, params) {
             this._super.apply(this, arguments);
         },
-        
-        //on_button_cancel: function() {
-            //console.log('boudin noir');
-        //},
     }),
 
+
     /** 
      * ------------------------------------------------------------
      * Thread Widget
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 442d41b6575..e92cbdb1fe4 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -57,14 +57,18 @@
             <field name="priority">1</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Compose Email" version="7.0">
+                <form string="Compose Email" version="7.0" >
                     <group col="4">
-                        <field name="subject" colspan="4" nolabel="1" placeholder="Subject..."/>
-                        <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"/>
-                        <field name="destination_partners" colspan="4" nolabel="1" widget="many2many_tags"/>
-                        <newline/>
+                        <field name="subject" colspan="4" nolabel="1" placeholder="Subject..."
+                                class="mail_compose_message_subject"/>
+                        <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"
+                                class="mail_compose_message_body_text"/>
+                        <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on ?"
+                                class="mail_compose_message_body_html" widget="text_html"/>
+                        <field name="destination_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
+                                class="mail_compose_message_partner_ids"/>
                         <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
-                        <p> or <a href="#">Send a Message</a></p>
+                        <p> or <a href="#" class="mail_compose_message_toggle">Send a Message</a></p>
                         <button icon="gtk-close" string="Cancel" special="cancel" />
                         <p>
                             Checklist . Attach

From 73dc2aee923b8056478bb5b2c72be8baf51cddb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 18 Jun 2012 17:06:08 +0200
Subject: [PATCH 092/397] [IMP] mail.compose.message widget: first integration
 in chatter.

bzr revid: tde@openerp.com-20120618150608-0go3xc0l3yil14ps
---
 addons/mail/static/src/js/mail.js                | 16 +++++++++++-----
 addons/mail/static/src/xml/mail.xml              | 11 ++++++++---
 addons/mail/wizard/mail_compose_message_view.xml |  8 ++++----
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ba5315ea544..895499abea8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -43,6 +43,8 @@ openerp.mail = function(session) {
         
         init: function(parent, params) {
             this._super(parent);
+            this.params = params || {};
+            this.params.extended_mode = params.extended_mode || false;
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message');
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
                 action_buttons: false,
@@ -59,7 +61,9 @@ openerp.mail = function(session) {
         start: function(parent, params) {
             var self = this;
             this._super.apply(this, arguments);
-            var main_node = this.$element;
+            console.log(this.$element);
+            var main_node = this.$element.find('div.oe_mail_msg_content');
+            console.log(main_node);
             
             return $.when(this.form_view.appendTo(main_node)).pipe(function() {
                 self.bind_events();
@@ -76,9 +80,11 @@ openerp.mail = function(session) {
             // advanced options for writing a message
             this.$element.find('a.mail_compose_message_toggle').click(function (event) {
                 event.preventDefault();
-                self.$element.find('span.mail_compose_message_subject').toggle();
-                self.$element.find('div.mail_compose_message_body_html').toggle();
-                self.$element.find('div.mail_compose_message_partner_ids').toggle();
+                self.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
+                self.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
+                self.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
+                self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
+                
             });
         },
         
@@ -167,7 +173,7 @@ openerp.mail = function(session) {
             $.when(display_done).then(this.proxy('do_customize_display'));
             
             // add message composition form view
-            this.compose_message = new mail.ComposeMessage();
+            this.compose_message = new mail.ComposeMessage(this, {'extended_mode': false});
             var compose_done = this.compose_message.appendTo(this.$element.find('div.oe_mail_thread_act'));
             
             return display_done && compose_done;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b0fa456d36c..8f4a74e6fad 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,14 +68,18 @@
         an e-mail.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_message">
-            <!-- contains the composition form -->
+        <div>
+            <img class="oe_mail_msg_image oe_left" alt="User img"/>
+            <div class="oe_mail_msg_content">
+                <!-- contains the composition form -->
+            </div>
+            <div class="oe_clear"/>
         </div>
-        <div class="oe_clear"/>
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
+<!--
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
@@ -83,6 +87,7 @@
             <a href="#" class="oe_mail_compose oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
             </a>
+-->
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index e92cbdb1fe4..2d8fd2cd140 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -60,13 +60,13 @@
                 <form string="Compose Email" version="7.0" >
                     <group col="4">
                         <field name="subject" colspan="4" nolabel="1" placeholder="Subject..."
-                                class="mail_compose_message_subject"/>
+                                class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"
-                                class="mail_compose_message_body_text"/>
+                                class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on ?"
-                                class="mail_compose_message_body_html" widget="text_html"/>
+                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
                         <field name="destination_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
-                                class="mail_compose_message_partner_ids"/>
+                                class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
                         <p> or <a href="#" class="mail_compose_message_toggle">Send a Message</a></p>
                         <button icon="gtk-close" string="Cancel" special="cancel" />

From 438eedc151c9318c8734c74e2a4d942881990896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 18 Jun 2012 18:03:28 +0200
Subject: [PATCH 093/397] [IMP] mail_message_common: subject is not required
 anymore. Having messages without subject can be useful.

bzr revid: tde@openerp.com-20120618160328-q19rx1em3gnfecjr
---
 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 beb6662e16a..82c42331038 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -106,7 +106,7 @@ class mail_message_common(osv.TransientModel):
     _name = 'mail.message.common'
     _rec_name = 'subject'
     _columns = {
-        'subject': fields.char('Subject', size=512, required=True),
+        'subject': fields.char('Subject', size=512),
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
         'record_name': fields.function(get_record_name, type='string', string='Message Record Name',

From 9f42229bd505a0e068357a9fe06473bbdf9d51de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 18 Jun 2012 18:03:57 +0200
Subject: [PATCH 094/397] [IMP] Chatter widget: added a mixin class holdign
 some tools functions.

bzr revid: tde@openerp.com-20120618160357-0zu4262wmggbe800
---
 addons/mail/static/src/js/mail.js | 40 ++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 895499abea8..b90b0489a6f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -24,6 +24,29 @@ openerp.mail = function(session) {
     var mail_msg_struct = mail.chatter_message_structure = {}; // TODO: USE IT OR NOT :)
 
 
+    /**
+     * ------------------------------------------------------------
+     * ChatterMixin class
+     * ------------------------------------------------------------
+     * 
+     * This mixin class holds a few tools method that will be used by
+     * the various Chatter widgets.
+     */
+
+    mail.ChatterMixin = {
+
+        init: function(parent, params) {
+            this._super(parent);
+            console.log('oinoin');
+        },
+        
+        /** get an image in /web/binary/image?... */
+        get_image: function(session_prefix, session_id, model, field, id) {
+            return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        },
+    };
+
+
     /**
      * ------------------------------------------------------------
      * ComposeMessage widget
@@ -38,7 +61,7 @@ openerp.mail = function(session) {
     session.web.form.widgets.add('mail.compose_message', 'openerp.mail.ComposeMessage');
     
     /* ComposeMessage is an extension of a Widget */
-    mail.ComposeMessage = session.web.Widget.extend({
+    mail.ComposeMessage = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
         template: 'mail.compose_message',
         
         init: function(parent, params) {
@@ -61,10 +84,11 @@ openerp.mail = function(session) {
         start: function(parent, params) {
             var self = this;
             this._super.apply(this, arguments);
-            console.log(this.$element);
+            // get user image
+            var user_avatar = this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.session.uid);
+            this.$element.find('img.oe_mail_msg_image').attr('src', user_avatar);
+            // bind events
             var main_node = this.$element.find('div.oe_mail_msg_content');
-            console.log(main_node);
-            
             return $.when(this.form_view.appendTo(main_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
@@ -91,7 +115,7 @@ openerp.mail = function(session) {
         destroy: function(parent, params) {
             this._super.apply(this, arguments);
         },
-    }),
+    })),
 
 
     /** 
@@ -114,7 +138,7 @@ openerp.mail = function(session) {
     session.web.form.widgets.add('Thread', 'openerp.mail.Thread');
 
     /* Thread is an extension of a Widget */
-    mail.Thread = session.web.Widget.extend({
+    mail.Thread = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
         template: 'Thread',
 
         /**
@@ -173,7 +197,7 @@ openerp.mail = function(session) {
             $.when(display_done).then(this.proxy('do_customize_display'));
             
             // add message composition form view
-            this.compose_message = new mail.ComposeMessage(this, {'extended_mode': false});
+            this.compose_message = new mail.ComposeMessage(this, {'extended_mode': false, 'uid': this.params.uid});
             var compose_done = this.compose_message.appendTo(this.$element.find('div.oe_mail_thread_act'));
             
             return display_done && compose_done;
@@ -525,7 +549,7 @@ openerp.mail = function(session) {
             return (this.session.uid == id);
         },
 
-    });
+    }));
 
 
     /** 

From ca5e516283dd9600ceb42106c48b472936089726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 10:23:53 +0200
Subject: [PATCH 095/397] [IMP] mail_message: added name_get method, because
 subject is not required anymore.

bzr revid: tde@openerp.com-20120619082353-htvona30p7k2ry0j
---
 addons/mail/mail_message.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 82c42331038..3adec17de14 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -93,6 +93,19 @@ class mail_message_common(osv.TransientModel):
         #   - args: [('body', 'ilike', 'blah')]
         return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
     
+    def name_get(self, cr, uid, ids, context=None):
+        res = []
+        for message in self.browse(cr, uid, ids, context=context):
+            name = ''
+            if message.subject:
+                name = '%s: ' % (message.subject)
+            if message.body_text:
+                name = '%s%s ' % (name, message.body_text[0:20])
+            if message.date:
+                name = '%s(%s)' % (name, message.date)
+            res.append((message.id, name))
+        return res
+
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
         if context is None:
             context = {}

From ead764b7c259992e990a28ea6c2613c0e647d9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 11:57:30 +0200
Subject: [PATCH 096/397] [CLEAN] Chatter widgets: mail_compose_message: a bit
 of cleaning.

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b90b0489a6f..b39e5563ac4 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -37,9 +37,9 @@ openerp.mail = function(session) {
 
         init: function(parent, params) {
             this._super(parent);
-            console.log('oinoin');
+            this.test = 'prout'
         },
-        
+
         /** get an image in /web/binary/image?... */
         get_image: function(session_prefix, session_id, model, field, id) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
@@ -66,8 +66,11 @@ openerp.mail = function(session) {
         
         init: function(parent, params) {
             this._super(parent);
+            session.mail.ChatterMixin.init.call(this, {});
+            // options
             this.params = params || {};
             this.params.extended_mode = params.extended_mode || false;
+            // create a form_view on the mail.compose.message wizard
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message');
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
                 action_buttons: false,
@@ -81,15 +84,15 @@ openerp.mail = function(session) {
          * widget start function
          * - builds and initializes the form view
          */
-        start: function(parent, params) {
+        start: function() {
             var self = this;
             this._super.apply(this, arguments);
             // get user image
             var user_avatar = this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.session.uid);
             this.$element.find('img.oe_mail_msg_image').attr('src', user_avatar);
             // bind events
-            var main_node = this.$element.find('div.oe_mail_msg_content');
-            return $.when(this.form_view.appendTo(main_node)).pipe(function() {
+            var msg_node = this.$element.find('div.oe_mail_msg_content');
+            return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
             });
@@ -104,6 +107,8 @@ openerp.mail = function(session) {
             // advanced options for writing a message
             this.$element.find('a.mail_compose_message_toggle').click(function (event) {
                 event.preventDefault();
+                self.params.extended_mode = ! self.params.extended_mode;
+                // toggle display
                 self.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
@@ -112,7 +117,7 @@ openerp.mail = function(session) {
             });
         },
         
-        destroy: function(parent, params) {
+        destroy: function() {
             this._super.apply(this, arguments);
         },
     })),

From 72efdb507d36a00a50e0a96fea859c4ca31b2923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 14:12:11 +0200
Subject: [PATCH 097/397] [IMP] Added ChatterMixinclass offering some tools for
 chatter widgets: also fixed template name that had changed for the wall.

bzr revid: tde@openerp.com-20120619121211-m4cc77xwmc91fe4w
---
 addons/mail/static/src/js/mail.js | 160 +++++++++++++-----------------
 1 file changed, 68 insertions(+), 92 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b39e5563ac4..68fa97ca6a1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,26 +4,6 @@ openerp.mail = function(session) {
     
     var mail = session.mail = {};
 
-    /**
-     * ------------------------------------------------------------
-     * Global variables for the Chatter
-     * ------------------------------------------------------------
-     * 
-     */
-
-    /**
-     * mail_int_mapping: structure to keep a trace of internal links mapping
-     *      mail_int_mapping['model'] = {
-     *          'name_get': [[id,label], [id,label], ...]
-     *          'fetch_ids': [id, id, ...] } */
-    var mail_int_mapping = mail.chatter_internal_mapping = {};
-    
-    /**
-     * mail_msg_struct: structure to orrganize chatter messages
-     */
-    var mail_msg_struct = mail.chatter_message_structure = {}; // TODO: USE IT OR NOT :)
-
-
     /**
      * ------------------------------------------------------------
      * ChatterMixin class
@@ -35,15 +15,68 @@ openerp.mail = function(session) {
 
     mail.ChatterMixin = {
 
+        /**
+        * mail_int_mapping: structure to keep a trace of internal links mapping
+        *      mail_int_mapping['model'] = {
+        *          'name_get': [[id,label], [id,label], ...]
+        *          'fetch_ids': [id, id, ...] } */
+        //var mail_int_mapping = {};
+        
+        /**
+        * mail_msg_struct: structure to orrganize chatter messages
+        */
+        //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
+
         init: function(parent, params) {
             this._super(parent);
             this.test = 'prout'
         },
 
+        do_bind_chatter_events: function() {
+            var self = this;
+            // event: click on an internal link
+            this.$element.delegate('a.intlink', 'click', function (event) {
+                event.preventDefault();
+                // lazy implementation: fetch data and try to redirect
+                if (! event.srcElement.dataset.resModel) return false;
+                else var res_model = event.srcElement.dataset.resModel;
+                var res_login = event.srcElement.dataset.resLogin;
+                var res_id = event.srcElement.dataset.resId;
+                if ((! res_login) && (! res_id)) return false;
+                if (! res_id) {
+                    var ds = new session.web.DataSet(self, res_model);
+                    var defer = ds.call('search', [[['login', '=', res_login]]]).then(function (records) {
+                        if (records[0]) {
+                            self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
+                        }
+                        else return false;
+                    });
+                }
+                else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
+            });
+        },
+
         /** get an image in /web/binary/image?... */
         get_image: function(session_prefix, session_id, model, field, id) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
+
+        /** Removes html tags, except b, em, br, ul, li */
+        do_text_remove_html_tags: function (string) {
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li)\\s*&gt;', 'gi'), '<$1$2>');
+            return html;
+        },
+        
+        /** Replaces line bracks by html line breaks (br) */
+        do_text_nl2br: function (str, is_xhtml) {   
+            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
+        },
+
+        /** checks if tue current user is the message author */
+        _is_author: function (message_user_id) {
+            return (this.session.uid == message_user_id);
+        },
     };
 
 
@@ -194,6 +227,7 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             // add events
             this.add_events();
+            
             // display user, fetch comments
             this.display_current_user();
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
@@ -216,6 +250,8 @@ openerp.mail = function(session) {
         
         add_events: function() {
             var self = this;
+            // generic events from Chatter Mixin
+            this.do_bind_chatter_events();
             // event: click on 'more' at bottom of thread
             this.$element.find('button.oe_mail_button_more').click(function () {
                 self.do_more();
@@ -285,39 +321,6 @@ openerp.mail = function(session) {
                 }
                 return false;
             });
-            // event: click on an internal link
-            this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) {
-                // lazy implementation: fetch data and try to redirect
-                if (! event.srcElement.dataset.resModel) return false;
-                else var res_model = event.srcElement.dataset.resModel;
-                var res_login = event.srcElement.dataset.resLogin;
-                var res_id = event.srcElement.dataset.resId;
-                if ((! res_login) && (! res_id)) return false;
-                if (! res_id) {
-                    var ds = new session.web.DataSet(self, res_model);
-                    var defer = ds.call('search', [[['login', '=', res_login]]]).then(function (records) {
-                        if (records[0]) {
-                            self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
-                        }
-                        else return false;
-                    });
-                }
-                else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
-            });
-            // event: click on "send an email"
-            this.$element.find('div.oe_mail_thread_act').delegate('a.oe_mail_compose', 'click', function (event) {
-                self.do_action({
-                        type: 'ir.actions.act_window',
-                        res_model: 'mail.compose.message',
-                        views: [[false, 'form']],
-                        view_type: 'form',
-                        view_mode: 'form',
-                        target: 'new',
-                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'mail.compose.message.mode': 'document'},
-                        key2: 'client_action_multi',
-                });
-                return false;
-            });
         },
         
         destroy: function () {
@@ -399,7 +402,7 @@ openerp.mail = function(session) {
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
             else { record.mini_url = tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
-            record.body = this.do_clean_text(record.body);
+            record.body = this.do_text_remove_html_tags(record.body);
             record.body = this.do_replace_internal_links(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
@@ -531,29 +534,6 @@ openerp.mail = function(session) {
                 regex_res = regex_intlink.exec(string);
             }
         },
-        
-        /** Removes html tags, except b, em, br */
-        do_clean_text: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
-            return html;
-        },
-        
-        /** Replaces line bracks by html line breaks (br) */
-        do_text_nl2br: function (str, is_xhtml) {   
-            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
-            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
-        },
-
-
-        /**
-         *    MISC TOOLS METHODS
-         */
-        
-        /** checks if tue current user is the message author */
-        _is_author: function (id) {
-            return (this.session.uid == id);
-        },
-
     }));
 
 
@@ -562,22 +542,14 @@ openerp.mail = function(session) {
      * mail_thread Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of a thread of messages. The
-     * [thread_level] parameter sets the thread level number:
-     * - root message
-     * - - sub message (parent_id = root message)
-     * - - - sub sub message (parent id = sub message)
-     * - - sub message (parent_id = root message)
-     * This widget has 2 ways of initialization, either you give records
-     * to be rendered, either it will fetch [limit] messages related to
-     * [res_model]:[res_id].
+     * This widget handles the display of the Chatter on documents.
      */
 
     /* Add ThreadView widget to registry */
     session.web.form.widgets.add('ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
-    mail.RecordThread = session.web.form.AbstractField.extend({
+    mail.RecordThread = session.web.form.AbstractField.extend(_.extend({}, session.mail.ChatterMixin, {
         // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
@@ -594,8 +566,13 @@ openerp.mail = function(session) {
 
         start: function() {
             this._super.apply(this, arguments);
+            this.bind_events();
+            this.reinit();
+        },
+        
+        bind_events: function() {
             var self = this;
-            // bind buttons
+            this.do_bind_chatter_events();
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
                 .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
@@ -603,7 +580,6 @@ openerp.mail = function(session) {
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
                 .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
-            this.reinit();
         },
 
         destroy: function () {
@@ -673,7 +649,7 @@ openerp.mail = function(session) {
             else { this.$element.find('button.oe_mail_button_followers').html('Display followers'); }
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
-    });
+    }));
     
     
     /* Add WallView widget to registry */
@@ -681,7 +657,7 @@ openerp.mail = function(session) {
     
     /* WallView widget: a wall of messages */
     mail.WallView = session.web.Widget.extend({
-        template: 'Wall',
+        template: 'mail.wall',
 
         /**
          * @param {Object} parent parent
@@ -815,7 +791,7 @@ openerp.mail = function(session) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
                 var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('WallThreadContainer', {});
+                var render_res = session.web.qweb.render('mail.wall.thread_container', {});
                 $('<div class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,

From 209efb9e4661d5c1950fd5dc61e5877c481cf8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 15:13:39 +0200
Subject: [PATCH 098/397] [IMP] Chatter widgets: removed unnecessary CSS
 classes (in xml and css); added a template for subscribers.

bzr revid: tde@openerp.com-20120619131339-2n3bu2cpfvisinli
---
 addons/mail/static/src/css/mail.css | 13 ---------
 addons/mail/static/src/xml/mail.xml | 43 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7226e1f04c5..a932bf640af 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -330,16 +330,3 @@
     padding: 0;
     margin: 0 0 4px 0;
 }
-
-.openerp a.oe_mail_oe_intlink {
-    color: #8786b7;
-}
-
-.openerp .oe_mail_oe_bold {
-    font-weight: bold;
-}
-
-/*.openerp .oe_mail_oe_space:after {*/
-    /*content: " · ";*/
-    /*margin-right: 2px;*/
-/*}*/
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 8f4a74e6fad..328ca3ba352 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -53,7 +53,7 @@
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
                 <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-                <button type="button" class="oe_mail_button_followers">Display followers</button>
+                <button type="button" class="oe_mail_button_followers">Show followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
                 <h4>Followers</h4>
@@ -62,6 +62,15 @@
         </div>
     </div>
 
+    <!--
+        record_thread.record_thread template
+        Template used to display subscibers
+        -->
+    <li t-name="mail.record_thread.subscriber">
+        <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
+        <a href="#" class="oe_mail_oe_intlink" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+    </li>
+
     <!--
         compose_message template
         This template holds the composition form to write a note or send
@@ -78,17 +87,7 @@
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
-<!--
-            <img class="oe_mail_msg_image oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
-            </div>
-            <a href="#" class="oe_mail_compose oe_right">Send an e-mail
-                <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
-            </a>
--->
-        </div>
+        <div class="oe_mail_thread_act"></div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
@@ -100,11 +99,11 @@
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
                 <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                    <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                 </t></t>
                 <t t-if="display['show_hide']">
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
+                    <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                    <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
@@ -120,7 +119,7 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-call="MessageDisplayManageLinks"/>
@@ -130,7 +129,7 @@
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
         </p>
         <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
@@ -145,32 +144,32 @@
         <ul>
             <t t-if="display['show_reply']">
                 <li>
-                    <a href="#" class="oe_mail_oe_intlink oe_mail_msg_reply">Reply</a>
+                    <a href="#" class="oe_mail_msg_reply">Reply</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
             <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_delete">Delete</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t></t>
             <t t-if="display['show_hide']">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Remove from Wall</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
             <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_reply_by_email">Reply by e-mail</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t></t>
             <li>
                 <span class="oe_fade"><t t-raw="record.date"/>
                 <t t-if="record.type != 'email'">
-                    by <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                    by <a href="#" class="oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 </t>
                 </span>
             </li>

From d0832400942372f2b3eb14900f45ff410a63d848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 15:14:03 +0200
Subject: [PATCH 099/397] [IMP] Chatter: improved and cleaned RecordThread
 widget.

bzr revid: tde@openerp.com-20120619131403-761j3a0dl2wxrbaq
---
 addons/mail/static/src/js/mail.js | 34 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 68fa97ca6a1..b6e21d73c7a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -555,31 +555,29 @@ openerp.mail = function(session) {
 
        init: function() {
             this._super.apply(this, arguments);
-            this.see_subscribers = true;
-            this.thread = null;
             this.params = this.get_definition_options();
             this.params.thread_level = this.params.thread_level || 0;
-            // datasets
+            this.params.see_subscribers = true;
+            this.params.see_subscribers_options = this.params.see_subscribers_options || false;
+            this.thread = null;
             this.ds = new session.web.DataSet(this, this.view.model);
             this.ds_users = new session.web.DataSet(this, 'res.users');
         },
 
         start: function() {
-            this._super.apply(this, arguments);
-            this.bind_events();
-            this.reinit();
-        },
-        
-        bind_events: function() {
             var self = this;
+            this._super.apply(this, arguments);
             this.do_bind_chatter_events();
-            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
+            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
+            if (! this.params.see_subscribers_options) {
+                this.$element.find('button.oe_mail_button_followers').hide(); }
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
                 .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
                 .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
                 .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+            this.reinit();
         },
 
         destroy: function () {
@@ -587,7 +585,8 @@ openerp.mail = function(session) {
         },
         
         reinit: function() {
-            this.see_subscribers = true;
+            this.params.see_subscribers = true;
+            this.params.see_subscribers_options = this.params.see_subscribers_options || false;
             this.$element.find('button.oe_mail_button_followers').html('Hide followers')
             this.$element.find('button.oe_mail_button_follow').hide();
             this.$element.find('button.oe_mail_button_unfollow').hide();
@@ -604,7 +603,7 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_recthread_main').empty();
             if (this.thread) this.thread.destroy();
             this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
-                                                    'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
+                                                'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
             var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
             return fetch_sub_done && thread_done;
         },
@@ -620,9 +619,8 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_recthread_followers h4').html('Followers (' + records.length + ')');
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
-				var mini_url = tools_get_image(self.session.prefix, self.session.session_id, 'res.users', 'avatar', record.id);
-                $('<li><img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '"/>' +
-                  '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
+                record.avatar_url = self.get_image(self.session.prefix, self.session.session_id, 'res.users', 'avatar', record.id);
+                $(session.web.qweb.render('mail.record_thread.subscriber', {'record': record})).appendTo(user_list);
             });
             if (self.is_subscriber) {
                 self.$element.find('button.oe_mail_button_follow').hide();
@@ -644,9 +642,9 @@ openerp.mail = function(session) {
         },
         
         do_toggle_followers: function () {
-            this.see_subscribers = ! this.see_subscribers;
-            if (this.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
-            else { this.$element.find('button.oe_mail_button_followers').html('Display followers'); }
+            this.params.see_subscribers = ! this.params.see_subscribers;
+            if (this.params.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
+            else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
     }));

From 657131a79006e75ad7fd63d7555c6468a2062a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 15:58:27 +0200
Subject: [PATCH 100/397] [REF] Thread widget: small refactoring: all widgets
 now use a mixin class that offers tools; tools_get_image deleted and replaced
 by its equivalent method from ChatterMixin.

bzr revid: tde@openerp.com-20120619135827-udxdawmejlgut4ab
---
 addons/mail/static/src/js/mail.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b6e21d73c7a..dad52441497 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -400,7 +400,7 @@ openerp.mail = function(session) {
         display_comment: function (record) {
             record.body = this.do_text_nl2br(record.body, true);
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
+            else { record.mini_url = this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
             record.body = this.do_text_remove_html_tags(record.body);
             record.body = this.do_replace_internal_links(record.body);
@@ -414,7 +414,7 @@ openerp.mail = function(session) {
         },
         
         display_current_user: function () {
-            return this.$element.find('img.oe_mail_msg_image').attr('src', tools_get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
+            return this.$element.find('img.oe_mail_msg_image').attr('src', this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
         },
         
         do_comment: function () {
@@ -539,7 +539,7 @@ openerp.mail = function(session) {
 
     /** 
      * ------------------------------------------------------------
-     * mail_thread Widget
+     * ThreadView Widget
      * ------------------------------------------------------------
      *
      * This widget handles the display of the Chatter on documents.
@@ -648,13 +648,21 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
     }));
-    
-    
+
+
+    /** 
+     * ------------------------------------------------------------
+     * WallView Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of the Chatter on the Wall.
+     */
+
     /* Add WallView widget to registry */
     session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
     
     /* WallView widget: a wall of messages */
-    mail.WallView = session.web.Widget.extend({
+    mail.WallView = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
         template: 'mail.wall',
 
         /**
@@ -847,7 +855,7 @@ openerp.mail = function(session) {
             comment_node.val('');
             var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html', 'tweet']).then(this.proxy('init_and_fetch_comments'));
         },
-    });
+    }));
     
 
     /**
@@ -906,11 +914,6 @@ openerp.mail = function(session) {
         }
         return cs;
     }
-
-    /** get an image in /web/binary/image?... */
-    function tools_get_image(session_prefix, session_id, model, field, id) {
-        return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
-    }
         
 };
 

From 97e94941cbdc02ffc6d3e45a441afa592070d900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 20 Jun 2012 10:44:54 +0200
Subject: [PATCH 101/397] [REF] view_form: removed a forgotten debug line.

bzr revid: tde@openerp.com-20120620084454-e8vezrij11bqakx7
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 37a4cde1f68..806649165ae 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2220,7 +2220,6 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
 
     set_value: function(value_) {
         this._super.apply(this, arguments);
-        console.log(this.$element);
         var textarea_node = this.$element.find('textarea.field_text');
         textarea_node.cleditor({
           //width:        500, // width not including margins, borders or padding

From e47fb55a1c998cca215021de44cbd1d765491535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 20 Jun 2012 10:57:58 +0200
Subject: [PATCH 102/397] [IMP] Chatter widgets: tools_sort_comments -> in
 chatter mixin; unified intlink -> oe_mail_oe_internal_link

bzr revid: tde@openerp.com-20120620085758-eactcpq4m03bp8lt
---
 addons/mail/static/src/js/mail.js   | 123 +++++++++++++---------------
 addons/mail/static/src/xml/mail.xml |   8 +-
 2 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dad52441497..efb97a892e5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -35,7 +35,7 @@ openerp.mail = function(session) {
         do_bind_chatter_events: function() {
             var self = this;
             // event: click on an internal link
-            this.$element.delegate('a.intlink', 'click', function (event) {
+            this.$element.delegate('a.oe_mail_oe_internal_link', 'click', function (event) {
                 event.preventDefault();
                 // lazy implementation: fetch data and try to redirect
                 if (! event.srcElement.dataset.resModel) return false;
@@ -77,6 +77,59 @@ openerp.mail = function(session) {
         _is_author: function (message_user_id) {
             return (this.session.uid == message_user_id);
         },
+
+        /**
+        * Add records to comments_structure array
+        * @param {Array} records records from mail.message sorted by date desc
+        * @returns {Object} cs comments_structure: dict
+        *                      cs.model_to_root_ids = {model: [root_ids], }
+        *                      cs.new_root_ids = [new_root_ids]
+        *                      cs.root_ids = [root_ids]
+        *                      cs.msgs = {record.id: record,}
+        *                      cs.tree_struct = {record.id: {
+        *                          'level': record_level in hierarchy, 0 is root,
+        *                          'msg_nbr': number of childs,
+        *                          'direct_childs': [msg_ids],
+        *                          'all_childs': [msg_ids],
+        *                          'for_thread_msgs': [records],
+        *                          'ancestors': [msg_ids], } }
+        */
+        chatter_sort_comments: function(cs, records, parent_id) {
+            var cur_iter = 0; var max_iter = 10; var modif = true;
+            while ( modif && (cur_iter++) < max_iter) {
+                modif = false;
+                _(records).each(function (record) {
+                    // root and not yet recorded
+                    if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
+                        // add to model -> root_list ids
+                        if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
+                        else cs['model_to_root_ids'][record.model].push(record.id);
+                        // add root data
+                        cs['new_root_ids'].push(record.id);
+                        // add record
+                        cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
+                        cs['msgs'][record.id] = record;
+                        modif = true;
+                    }
+                    // not yet recorded, but parent is recorded
+                    else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
+                        var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
+                        // update parent structure
+                        cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
+                        cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
+                        // update ancestors structure
+                        for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
+                            cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
+                        }
+                        // add record
+                        cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
+                        cs['msgs'][record.id] = record;
+                        modif = true;
+                    }
+                });
+            }
+            return cs;
+    }
     };
 
 
@@ -362,7 +415,7 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            tools_sort_comments(this.comments_structure, records, this.params.parent_id);
+            this.chatter_sort_comments(this.comments_structure, records, this.params.parent_id);
             
             /* WIP: map matched regexp -> records to browse with name */
             //_(records).each(function (record) {
@@ -428,7 +481,7 @@ openerp.mail = function(session) {
         /**
          * Create a domain to fetch new comments according to
          * comment already present in comments_structure
-         * @param {Object} comments_structure (see tools_sort_comments)
+         * @param {Object} comments_structure (see chatter_sort_comments)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
         get_fetch_domain: function (comments_structure) {
@@ -670,7 +723,7 @@ openerp.mail = function(session) {
          * @param {Object} [params]
          * @param {Number} [params.limit=20] number of messages to show and fetch
          * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} comments_structure see tools_sort_comments
+         * @var {Array} comments_structure see chatter_sort_comments
          */
         init: function (parent, params) {
             this._super(parent);
@@ -815,7 +868,7 @@ openerp.mail = function(session) {
          * Add records to comments_structure object: see function for details
          */
         sort_comments: function(records) {
-            tools_sort_comments(this.comments_structure, records, false);
+            this.chatter_sort_comments(this.comments_structure, records, false);
         },
 
         /**
@@ -856,65 +909,5 @@ openerp.mail = function(session) {
             var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html', 'tweet']).then(this.proxy('init_and_fetch_comments'));
         },
     }));
-    
-
-    /**
-     *    TOOLS
-     */
-
-    /**
-    * Add records to comments_structure array
-    * @param {Array} records records from mail.message sorted by date desc
-    * @returns {Object} cs comments_structure: dict
-    *                      cs.model_to_root_ids = {model: [root_ids], }
-    *                      cs.new_root_ids = [new_root_ids]
-    *                      cs.root_ids = [root_ids]
-    *                      cs.msgs = {record.id: record,}
-    *                      cs.tree_struct = {record.id: {
-    *                          'level': record_level in hierarchy, 0 is root,
-    *                          'msg_nbr': number of childs,
-    *                          'direct_childs': [msg_ids],
-    *                          'all_childs': [msg_ids],
-    *                          'for_thread_msgs': [records],
-    *                          'ancestors': [msg_ids], } }
-    */
-    function tools_sort_comments(cs, records, parent_id) {
-        var cur_iter = 0; var max_iter = 10; var modif = true;
-        while ( modif && (cur_iter++) < max_iter) {
-            modif = false;
-            _(records).each(function (record) {
-                // root and not yet recorded
-                if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-                    // add to model -> root_list ids
-                    if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-                    else cs['model_to_root_ids'][record.model].push(record.id);
-                    // add root data
-                    cs['new_root_ids'].push(record.id);
-                    // add record
-                    cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-                    cs['msgs'][record.id] = record;
-                    modif = true;
-                }
-                // not yet recorded, but parent is recorded
-                else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-                    var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-                    // update parent structure
-                    cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-                    cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-                    // update ancestors structure
-                    for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-                        cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-                    }
-                    // add record
-                    cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-                    cs['msgs'][record.id] = record;
-                    modif = true;
-                }
-            });
-        }
-        return cs;
-    }
         
 };
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 328ca3ba352..aebf842dc13 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
         -->
     <li t-name="mail.record_thread.subscriber">
         <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
-        <a href="#" class="oe_mail_oe_intlink" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+        <a href="#" class="oe_mail_oe_internal_link" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
     </li>
 
     <!--
@@ -119,7 +119,7 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="oe_mail_oe_internal_link" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-call="MessageDisplayManageLinks"/>
@@ -129,7 +129,7 @@
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+                <a href="#" class="oe_mail_oe_internal_link" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
         </p>
         <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
@@ -169,7 +169,7 @@
             <li>
                 <span class="oe_fade"><t t-raw="record.date"/>
                 <t t-if="record.type != 'email'">
-                    by <a href="#" class="oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                    by <a href="#" class="oe_mail_oe_internal_link" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 </t>
                 </span>
             </li>

From fa32ecdd5951f29c3e7263e733fc9f580bcffc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 20 Jun 2012 11:18:22 +0200
Subject: [PATCH 103/397] [REF] ThreadView widget renamed to mail_thread.

bzr revid: tde@openerp.com-20120620091822-bbyfp7qt2msrdm8u
---
 addons/account/account_invoice_view.xml         |  4 ++--
 addons/crm/crm_lead_view.xml                    |  4 ++--
 addons/crm/crm_meeting_view.xml                 |  2 +-
 addons/crm/crm_phonecall_view.xml               |  2 +-
 addons/crm_claim/crm_claim_view.xml             |  2 +-
 addons/crm_fundraising/crm_fundraising_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/idea/idea_view.xml                       |  2 +-
 addons/mail/doc/mail_openchatter_howto.rst      |  6 +++---
 addons/mail/mail_group_view.xml                 |  2 +-
 addons/mail/mail_message_view.xml               |  4 ++--
 addons/mail/res_partner_view.xml                |  2 +-
 addons/mail/res_users_view.xml                  |  2 +-
 addons/mail/static/src/js/mail.js               | 12 ++++++------
 addons/mrp/mrp_view.xml                         |  2 +-
 addons/mrp_operations/mrp_operations_view.xml   |  2 +-
 addons/procurement/procurement_view.xml         |  2 +-
 addons/product/product_view.xml                 |  2 +-
 addons/project/project_view.xml                 |  4 ++--
 addons/project_issue/project_issue_view.xml     |  2 +-
 addons/purchase/purchase_view.xml               |  2 +-
 addons/sale/sale_view.xml                       |  2 +-
 addons/stock/stock_view.xml                     |  4 ++--
 26 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 58a1abac364..c8acb96ccb2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -261,7 +261,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -393,7 +393,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 78a32298a5e..7786735e412 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -179,7 +179,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
@@ -535,7 +535,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c855fae26cc..9c1e8a19ce5 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -219,7 +219,7 @@
                 </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0722a278fb0..f28993bf15f 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -109,7 +109,7 @@
                 <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
             </form>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index acff477535c..aaa379d06f5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -167,7 +167,7 @@
                     </group>
                 </sheet>
                 <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index eb7bcade10b..c219cdb8ac2 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -119,7 +119,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4612fdf20a5..978632fbf2c 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -98,7 +98,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ffb15eb8cb6..b3aef9e57d3 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -131,7 +131,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
             </form>
             </field>
@@ -407,7 +407,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4342fb145e5..0621fd34ac9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -100,7 +100,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
@@ -144,7 +144,7 @@
                 </notebook>
             </sheet>
             <div class="oe_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
             </div>
             </form>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2e103845212..7304aafbc5d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -167,7 +167,7 @@
                 </notebook>
             </sheet>
             <footer>
-                <field name="message_ids" widget="ThreadView"/>
+                <field name="message_ids" widget="mail_thread"/>
             </footer>
           </form>
         </field>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 10f703101ff..a38853be91f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -78,7 +78,7 @@
                     <h2><field name="category_ids"/></h2>
                     <field name="description"/>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 7ca52348d99..4c8797e7f8b 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -38,7 +38,7 @@ Make your module inheriting from the ``mail.thread`` class.
     # inherit from mail.thread allows the use of OpenChatter
     _inherit = ['mail.thread']
 
-Use the thread viewer widget inside your form view by using the ThreadView widget on the message_ids field inherited from mail.thread.
+Use the thread viewer widget inside your form view by using the mail_thread widget on the message_ids field inherited from mail.thread.
 
 ::
 
@@ -50,7 +50,7 @@ Use the thread viewer widget inside your form view by using the ThreadView widge
     <field name="arch" type="xml">
       <form>
       [...]
-      <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+      <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
       </form>
     </field>
   </record>
@@ -131,7 +131,7 @@ The drawback of this method is that it is no longer possible to those subscriber
 Messages display management
 ++++++++++++++++++++++++++++
 
-By default, the ThreadView widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
+By default, the mail_thread widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
 
  - messages related to the user, as usual (messages with ``model = res.users, res_id = current_document_id``)
  - messages directly pushed to this user (containing @login)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 4fb35058170..c4c10196f99 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -91,7 +91,7 @@
                         </div>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"
+                        <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                     </footer>
                 </form>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 87c43bb6f83..304b7c2f653 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -272,13 +272,13 @@
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
             <field name="name">News Feed</field>
-            <field name="tag">mail.all_feeds</field>
+            <field name="tag">mail.wall</field>
             <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
         </record>
 
         <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
-            <field name="tag">mail.all_feeds</field>
+            <field name="tag">mail.wall</field>
             <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'my_feeds': True}"/>
         </record>
     </data>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 0a9860dc979..15f6618c8e5 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <footer>
-                    <field name="message_ids" widget="ThreadView" 
+                    <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </footer>
                 </xpath>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 428f53d092e..918f77e0ace 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -28,7 +28,7 @@
                 </field>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </xpath>
             </data>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index efb97a892e5..a6fb85326fc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -592,16 +592,16 @@ openerp.mail = function(session) {
 
     /** 
      * ------------------------------------------------------------
-     * ThreadView Widget
+     * mail_thread Widget
      * ------------------------------------------------------------
      *
      * This widget handles the display of the Chatter on documents.
      */
 
-    /* Add ThreadView widget to registry */
-    session.web.form.widgets.add('ThreadView', 'openerp.mail.RecordThread');
+    /* Add mail_thread widget to registry */
+    session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
 
-    /* ThreadView widget: thread of comments */
+    /* mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend(_.extend({}, session.mail.ChatterMixin, {
         // QWeb template to use when rendering the object
         template: 'mail.record_thread',
@@ -712,10 +712,10 @@ openerp.mail = function(session) {
      */
 
     /* Add WallView widget to registry */
-    session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
+    session.web.client_actions.add('mail.wall', 'session.mail.Wall');
     
     /* WallView widget: a wall of messages */
-    mail.WallView = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
+    mail.Wall = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
         template: 'mail.wall',
 
         /**
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8559a679beb..f12826f5d00 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -766,7 +766,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..0aca659220d 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -112,7 +112,7 @@
                 </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c9a6d55c9d4..41fd653491e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -94,7 +94,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce95cc8a044..e6fe35d52bf 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -185,7 +185,7 @@
                         </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9fd193dc411..843759b07c2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -120,7 +120,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -421,7 +421,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2b93cfec105..7255e1baf12 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -115,7 +115,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c107d984ce..a84bc1a2b6d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -207,7 +207,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                   <field name="message_ids" widget="ThreadView"/>
+                   <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e2d04f2da3b..9d934128475 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -275,7 +275,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff75c333b11..75a3a0e8866 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -974,7 +974,7 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <footer>
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </footer>
                     </xpath>
                 </data>
@@ -1089,7 +1089,7 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_bottom">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </div>
                     </xpath>
                 </data>

From 22f573850c9fd624da5e5889c715d244f9881163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 21 Jun 2012 17:24:28 +0200
Subject: [PATCH 104/397] [WIP] Thrad widget: work about the composition form
 widget.

bzr revid: tde@openerp.com-20120621152428-b6bk3o5su63xy9tm
---
 addons/mail/mail_group_view.xml            |   4 +-
 addons/mail/static/src/js/mail.js          | 303 +++++++++++----------
 addons/mail/static/src/xml/mail.xml        |  38 ++-
 addons/mail/wizard/mail_compose_message.py |   4 +
 4 files changed, 197 insertions(+), 152 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index c4c10196f99..cc6e2e7cee9 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -62,14 +62,14 @@
                                 <group colspan="4" col="4">
                                     <field name="description" colspan="4" nolabel="1"/>
                                 </group>
-                                <group colspan="2" col="2" class="oe_form_readonly_hidden">
+                                <group colspan="2" col="2" class="oe_edit_only">
                                     <field name="responsible_id" colspan="2"/>
                                     <field name="public" colspan="2"/>
                                     <field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
                                 </group>
                             </group>
                         </group>
-                        <div class="oe_form_readonly_hidden">
+                        <div class="oe_edit_only">
                             <group colspan="4" col="4">
                                 <group colspan="2" col="3">
                                     <h3>Models for automatic message fetching</h3>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a6fb85326fc..d02e823d7ee 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -6,14 +6,14 @@ openerp.mail = function(session) {
 
     /**
      * ------------------------------------------------------------
-     * ChatterMixin class
+     * ChatterUtils
      * ------------------------------------------------------------
      * 
-     * This mixin class holds a few tools method that will be used by
+     * This class holds a few tools method that will be used by
      * the various Chatter widgets.
      */
 
-    mail.ChatterMixin = {
+    mail.ChatterUtils = {
 
         /**
         * mail_int_mapping: structure to keep a trace of internal links mapping
@@ -27,15 +27,9 @@ openerp.mail = function(session) {
         */
         //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
 
-        init: function(parent, params) {
-            this._super(parent);
-            this.test = 'prout'
-        },
-
-        do_bind_chatter_events: function() {
-            var self = this;
+        do_bind_chatter_events: function(widget) {
             // event: click on an internal link
-            this.$element.delegate('a.oe_mail_oe_internal_link', 'click', function (event) {
+            widget.$element.delegate('a.oe_mail_oe_internal_link', 'click', function (event) {
                 event.preventDefault();
                 // lazy implementation: fetch data and try to redirect
                 if (! event.srcElement.dataset.resModel) return false;
@@ -44,15 +38,15 @@ openerp.mail = function(session) {
                 var res_id = event.srcElement.dataset.resId;
                 if ((! res_login) && (! res_id)) return false;
                 if (! res_id) {
-                    var ds = new session.web.DataSet(self, res_model);
+                    var ds = new session.web.DataSet(widget, res_model);
                     var defer = ds.call('search', [[['login', '=', res_login]]]).then(function (records) {
                         if (records[0]) {
-                            self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
+                            widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
                         }
                         else return false;
                     });
                 }
-                else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
+                else widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
             });
         },
 
@@ -61,18 +55,6 @@ openerp.mail = function(session) {
             return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** Removes html tags, except b, em, br, ul, li */
-        do_text_remove_html_tags: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li)\\s*&gt;', 'gi'), '<$1$2>');
-            return html;
-        },
-        
-        /** Replaces line bracks by html line breaks (br) */
-        do_text_nl2br: function (str, is_xhtml) {   
-            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
-            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
-        },
-
         /** checks if tue current user is the message author */
         _is_author: function (message_user_id) {
             return (this.session.uid == message_user_id);
@@ -94,7 +76,7 @@ openerp.mail = function(session) {
         *                          'for_thread_msgs': [records],
         *                          'ancestors': [msg_ids], } }
         */
-        chatter_sort_comments: function(cs, records, parent_id) {
+        sort_comments: function(cs, records, parent_id) {
             var cur_iter = 0; var max_iter = 10; var modif = true;
             while ( modif && (cur_iter++) < max_iter) {
                 modif = false;
@@ -129,7 +111,122 @@ openerp.mail = function(session) {
                 });
             }
             return cs;
-    }
+        },
+
+        /**
+         *    CONTENT MANIPULATION
+         * 
+         * Regular expressions
+         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
+         *   logins that are emails
+         *      1. '(void)'
+         *      2. login@log.log
+         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
+         *   for internal links to model ir.attachment, id=3, and with
+         *   optional label 'My Label'. Note that having a '|Label' is not
+         *   mandatory, because the regex should still be correct.
+         *      1. '(void)'
+         *      2. 'ir'
+         *      3. 'attachment'
+         *      4. '3'
+         *      5. 'My Label'
+         */
+
+        /** Removes html tags, except b, em, br, ul, li */
+        do_text_remove_html_tags: function (string) {
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li)\\s*&gt;', 'gi'), '<$1$2>');
+            return html;
+        },
+        
+        /** Replaces line breaks by html line breaks (br) */
+        do_text_nl2br: function (str, is_xhtml) {   
+            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
+        },
+
+        /**
+         * Replaces some expressions
+         * - @login - shorcut to link to a res.user, given its login
+         * - [ir.attachment,3|My Label] - shortcut to an internal
+         *   document
+         * - :name - shortcut to an image
+         */
+        do_replace_expressions: function (string) {
+            var self = this;
+            var icon_list = ['al', 'pinky']
+            /* shortcut to user: @login */
+            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+            var regex_res = regex_login.exec(string);
+            while (regex_res != null) {
+                var login = regex_res[2];
+                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
+                regex_res = regex_login.exec(string);
+            }
+            /* shortcut for internal document */
+            var regex_login = new RegExp(/(^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]/g);
+            var regex_res = regex_login.exec(string);
+            while (regex_res != null) {
+                var res_model = regex_res[2] + '.' + regex_res[3];
+                var res_id = regex_res[4];
+                if (! regex_res[5]) {
+                    var label = res_model + ':' + res_id }
+                else {
+                    var label = regex_res[5];
+                }
+                string = string.replace(regex_res[0], regex_res[1] + '<a href="#model=' + res_model + '&id=' + res_id + '>' + label + '</a>');
+                regex_res = regex_login.exec(string);
+            }
+            /* special shortcut: :name, try to find an icon if in list */
+            var regex_login = new RegExp(/(^|\s):((\w)*)/g);
+            var regex_res = regex_login.exec(string);
+            while (regex_res != null) {
+                var icon_name = regex_res[2];
+                if (_.include(icon_list, icon_name))
+                    string = string.replace(regex_res[0], regex_res[1] + '<img src="/mail/static/src/img/_' + icon_name + '.png" width="22px" height="22px" alt="' + icon_name + '"/>');
+                regex_res = regex_login.exec(string);
+            }
+            return string;
+        },
+
+        /**
+         * Checks a string to find an expression that will be replaced
+         * by an internal link and requiring a name_get to replace
+         * the expression.
+         * :param mapping: structure to keep a trace of internal links mapping
+         *                  mapping['model'] = {
+         *                      name_get': [[id,label], [id,label], ...]
+         *                      'to_fetch_ids': [id, id, ...]
+         *                  }
+         * CURRENTLY NOT IMPLEMENTED */
+        do_check_for_name_get_mapping: function(string, mapping) {
+            /* shortcut to user: @login */
+            //var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+            //var regex_res = regex_login.exec(string);
+            //while (regex_res != null) {
+                //var login = regex_res[2];
+                //if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
+                //this.map_hash['res.users']['login'].push(login);
+                //regex_res = regex_login.exec(string);
+            //}
+            /* document link with name_get: [res.model,name] */
+            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
+            //var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+            //regex_res = regex_intlink.exec(string);
+            //while (regex_res != null) {
+                //var res_model = regex_res[2] + '.' + regex_res[3];
+                //var res_name = regex_res[4];
+                //if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
+                //this.map_hash[res_model]['name'].push(res_name);
+                //regex_res = regex_intlink.exec(string);
+            //}
+        },
+        
+        /**
+         * Updates the mapping; check for to_fetch_ids for each recorded
+         * model, and perform a name_get to update the mapping.
+         * CURRENTLY NOT IMPLEMENTED */
+        do_update_name_get_mapping: function(mapping) {
+        },
     };
 
 
@@ -142,28 +239,26 @@ openerp.mail = function(session) {
      * This form is an OpenERP form_view, build on a mail.compose.message
      * wizard.
      */
-    
-    /* Add ComposeMessage widget to registry */
-    session.web.form.widgets.add('mail.compose_message', 'openerp.mail.ComposeMessage');
-    
-    /* ComposeMessage is an extension of a Widget */
-    mail.ComposeMessage = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
+
+    mail.ComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
         
         init: function(parent, params) {
             this._super(parent);
-            session.mail.ChatterMixin.init.call(this, {});
             // options
             this.params = params || {};
             this.params.extended_mode = params.extended_mode || false;
+            // create a context for the default_get of the compose form
+            var context = {caca: 'prout'};
             // create a form_view on the mail.compose.message wizard
-            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message');
+            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
                 action_buttons: false,
                 pager: false,
                 initial_mode: 'edit',
                 }
             );
+            //debugger;
         },
         
         /**
@@ -174,7 +269,7 @@ openerp.mail = function(session) {
             var self = this;
             this._super.apply(this, arguments);
             // get user image
-            var user_avatar = this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.session.uid);
+            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.session.uid);
             this.$element.find('img.oe_mail_msg_image').attr('src', user_avatar);
             // bind events
             var msg_node = this.$element.find('div.oe_mail_msg_content');
@@ -206,7 +301,16 @@ openerp.mail = function(session) {
         destroy: function() {
             this._super.apply(this, arguments);
         },
-    })),
+        
+        do_action: function() {
+            //debugger;
+            var context = arguments[0].context;
+            context.caca = 'prout';
+            this._super.apply(this, arguments);
+            console.log(this);
+            console.log(arguments);
+        },
+    }),
 
 
     /** 
@@ -225,11 +329,7 @@ openerp.mail = function(session) {
      * [res_model]:[res_id].
      */
 
-    /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add('Thread', 'openerp.mail.Thread');
-
-    /* Thread is an extension of a Widget */
-    mail.Thread = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
+    mail.Thread = session.web.Widget.extend({
         template: 'Thread',
 
         /**
@@ -304,7 +404,7 @@ openerp.mail = function(session) {
         add_events: function() {
             var self = this;
             // generic events from Chatter Mixin
-            this.do_bind_chatter_events();
+            mail.ChatterUtils.do_bind_chatter_events(this);
             // event: click on 'more' at bottom of thread
             this.$element.find('button.oe_mail_button_more').click(function () {
                 self.do_more();
@@ -415,7 +515,7 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            this.chatter_sort_comments(this.comments_structure, records, this.params.parent_id);
+            mail.ChatterUtils.sort_comments(this.comments_structure, records, this.params.parent_id);
             
             /* WIP: map matched regexp -> records to browse with name */
             //_(records).each(function (record) {
@@ -447,16 +547,14 @@ openerp.mail = function(session) {
             if (this.params.thread_level == 0) this.params.offset += records.length;
         },
 
-        /**
-         * Display a record
-         */
+        /** Displays a record, performs text/link formatting */
         display_comment: function (record) {
-            record.body = this.do_text_nl2br(record.body, true);
+            record.body = mail.ChatterUtils.do_text_nl2br(record.body, true);
             if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
+            else { record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); }    
             // body text manipulation
-            record.body = this.do_text_remove_html_tags(record.body);
-            record.body = this.do_replace_internal_links(record.body);
+            record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
+            record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
             // render
@@ -467,7 +565,7 @@ openerp.mail = function(session) {
         },
         
         display_current_user: function () {
-            return this.$element.find('img.oe_mail_msg_image').attr('src', this.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
+            return this.$element.find('img.oe_mail_msg_image').attr('src', mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
         },
         
         do_comment: function () {
@@ -481,7 +579,7 @@ openerp.mail = function(session) {
         /**
          * Create a domain to fetch new comments according to
          * comment already present in comments_structure
-         * @param {Object} comments_structure (see chatter_sort_comments)
+         * @param {Object} comments_structure (see sort_comments)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
         get_fetch_domain: function (comments_structure) {
@@ -514,80 +612,7 @@ openerp.mail = function(session) {
             return this.fetch_comments(this.params.limit, this.params.offset, domain);
         },
 
-
-        /**
-         *    CONTENT MANIPULATION
-         * 
-         * Regular expressions
-         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
-         *   logins that are emails
-         *      1. '(void')
-         *      2. login@log.log
-         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
-         *   for internal links to model ir.attachment, id=3, and with
-         *   optional label 'My Label'. Note that having a '|Label' is not
-         *   mandatory, because the regex should still be correct.
-         *      1. '(void)'
-         *      2. 'ir'
-         *      3. 'attachment'
-         *      4. '3'
-         *      5. 'My Label'
-         */
-
-        /**
-         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-         */
-        do_replace_internal_links: function (string) {
-            var self = this;
-            var icon_list = ['al', 'pinky']
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
-                regex_res = regex_login.exec(string);
-            }
-            /* special shortcut: :name, try to find an icon if in list */
-            var regex_login = new RegExp(/(^|\s):((\w)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var icon_name = regex_res[2];
-                if (_.include(icon_list, icon_name))
-                    string = string.replace(regex_res[0], regex_res[1] + '<img src="/mail/static/src/img/_' + icon_name + '.png" width="22px" height="22px" alt="' + icon_name + '"/>');
-                regex_res = regex_login.exec(string);
-            }
-            return string;
-        },
-        
-        /**
-         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-         */
-        do_check_for_internal_links: function(string) {
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
-                this.map_hash['res.users']['login'].push(login);
-                regex_res = regex_login.exec(string);
-            }
-            /* document link with name_get: [res.model,name] */
-            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
-            var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-            regex_res = regex_intlink.exec(string);
-            while (regex_res != null) {
-                var res_model = regex_res[2] + '.' + regex_res[3];
-                var res_name = regex_res[4];
-                if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
-                this.map_hash[res_model]['name'].push(res_name);
-                regex_res = regex_intlink.exec(string);
-            }
-        },
-    }));
+    });
 
 
     /** 
@@ -602,7 +627,7 @@ openerp.mail = function(session) {
     session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
 
     /* mail_thread widget: thread of comments */
-    mail.RecordThread = session.web.form.AbstractField.extend(_.extend({}, session.mail.ChatterMixin, {
+    mail.RecordThread = session.web.form.AbstractField.extend({
         // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
@@ -620,7 +645,7 @@ openerp.mail = function(session) {
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            this.do_bind_chatter_events();
+            mail.ChatterUtils.do_bind_chatter_events(this);
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
             if (! this.params.see_subscribers_options) {
                 this.$element.find('button.oe_mail_button_followers').hide(); }
@@ -672,7 +697,7 @@ openerp.mail = function(session) {
             this.$element.find('div.oe_mail_recthread_followers h4').html('Followers (' + records.length + ')');
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
-                record.avatar_url = self.get_image(self.session.prefix, self.session.session_id, 'res.users', 'avatar', record.id);
+                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'avatar', record.id);
                 $(session.web.qweb.render('mail.record_thread.subscriber', {'record': record})).appendTo(user_list);
             });
             if (self.is_subscriber) {
@@ -700,7 +725,7 @@ openerp.mail = function(session) {
             else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
             this.$element.find('div.oe_mail_recthread_followers').toggle();
         },
-    }));
+    });
 
 
     /** 
@@ -715,7 +740,7 @@ openerp.mail = function(session) {
     session.web.client_actions.add('mail.wall', 'session.mail.Wall');
     
     /* WallView widget: a wall of messages */
-    mail.Wall = session.web.Widget.extend(_.extend({}, session.mail.ChatterMixin, {
+    mail.Wall = session.web.Widget.extend({
         template: 'mail.wall',
 
         /**
@@ -723,7 +748,7 @@ openerp.mail = function(session) {
          * @param {Object} [params]
          * @param {Number} [params.limit=20] number of messages to show and fetch
          * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} comments_structure see chatter_sort_comments
+         * @var {Array} comments_structure see sort_comments
          */
         init: function (parent, params) {
             this._super(parent);
@@ -845,7 +870,7 @@ openerp.mail = function(session) {
         display_comments: function (records) {
             var self = this;
             this.do_update_show_more(records.length >= self.params.limit);
-            this.sort_comments(records);
+            mail.ChatterUtils.sort_comments(this.comments_structure, records, false);
             _(this.comments_structure['new_root_ids']).each(function (root_id) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
@@ -867,9 +892,9 @@ openerp.mail = function(session) {
         /**
          * Add records to comments_structure object: see function for details
          */
-        sort_comments: function(records) {
-            this.chatter_sort_comments(this.comments_structure, records, false);
-        },
+        //sort_comments: function(records) {
+            //this.chatter_sort_comments(this.comments_structure, records, false);
+        //},
 
         /**
          * Create a domain to fetch new comments according to
@@ -908,6 +933,6 @@ openerp.mail = function(session) {
             comment_node.val('');
             var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html', 'tweet']).then(this.proxy('init_and_fetch_comments'));
         },
-    }));
+    });
         
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index aebf842dc13..ec3e3d6b8b2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -87,8 +87,12 @@
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act"></div>
-        <div class="oe_mail_thread_display"></div>
+        <div class="oe_mail_thread_act">
+            <!-- contains the composition form -->
+        </div>
+        <div class="oe_mail_thread_display">
+            <!-- contains the threads -->
+        </div>
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
         </div>
@@ -98,9 +102,15 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                    <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                </t></t>
+                <t t-if="display['show_delete']">
+<!--
+                    <t t-if="thread._is_author(record.user_id[0])">
+-->
+                        <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+<!--
+                    </t>
+-->
+                </t>
                 <t t-if="display['show_hide']">
                     <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
                     <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
@@ -148,12 +158,18 @@
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
-            <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
-                    <span class="oe_mail_oe_space oe_fade"> · </span>
-                </li>
-            </t></t>
+            <t t-if="display['show_delete']">
+<!--
+                <t t-if="thread._is_author(record.user_id[0])">
+-->
+                    <li>
+                        <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
+                        <span class="oe_mail_oe_space oe_fade"> · </span>
+                    </li>
+<!--
+                </t>
+-->
+            </t>
             <t t-if="display['show_hide']">
                 <li>
                     <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Remove from Wall</a>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 767cf5f28c9..c595f0a187e 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -67,6 +67,8 @@ class mail_compose_message(osv.osv_memory):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         """
+        print 'default_get'
+        print context
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
@@ -196,6 +198,8 @@ class mail_compose_message(osv.osv_memory):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         '''
+        print 'send_mail'
+        print context
         if context is None:
             context = {}
         mail_message = self.pool.get('mail.message')

From de90ef25dc393dc19d4b32e97f2e64b1cfeb8db4 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 17:33:53 +0530
Subject: [PATCH 105/397] [IMP]Manufacturing orders view change

bzr revid: kjo@tinyerp.com-20120622120353-poglhhjdz17vbegi
---
 addons/mrp/mrp.py                             |  8 ++--
 addons/mrp/mrp_view.xml                       | 40 +++++++++++--------
 addons/mrp_operations/mrp_operations_view.xml |  4 +-
 addons/sale_mrp/sale_mrp.py                   |  4 +-
 addons/sale_mrp/sale_mrp_view.xml             |  6 ++-
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3214cad5a5c..e22bc286e0a 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -472,9 +472,9 @@ class mrp_production(osv.osv):
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
-        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict",
+        'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
             help="This is the Internal Picking List that brings the finished product to the production plan"),
-        'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
+        'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
         'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
         'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
@@ -1112,9 +1112,9 @@ class mrp_production_product_line(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty'),
+        'product_uos_qty': fields.float('Product UOS Quantity'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
     }
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8559a679beb..456cd5cbed8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -642,17 +642,19 @@
                     <notebook>
                         <page string="Consumed Products">
                             <group col="4">
+                                <group>
+                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                </group>
                                 <group>
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                                </group>
+                             </group>
+                                <separator string="Products to Consume"/>
                                 <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                     <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                         <field name="product_id" />
-                                        <field name="product_qty"  string="Qty"/>
+                                        <field name="product_qty"  string="Quantity"/>
                                         <field name="product_uom"  string="Unit of Measure"/>
                                         <field name="location_id"  string="Source Loc."/>
                                         <field name="state" invisible="1"/>
@@ -671,10 +673,11 @@
                                             states="draft,waiting,confirmed,assigned"/>
                                     </tree>
                                 </field>
+                                <separator string="Consumed Product"/>
                                 <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                       <field name="product_qty" readonly="1" string="Quantity"/>
                                        <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -686,14 +689,13 @@
                                            states="done,cancel"/>
                                    </tree>
                                 </field>
-                            </group>
                         </page>
                         <page string="Finished Products">
-                            <group>
-                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            <separator string="Products to Produce"/>
+                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_qty"  string="Quantity"/>
                                     <field name="product_uom"  string="Unit of Measure"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move_server)d"
@@ -706,10 +708,11 @@
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
                             </field>
-                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
+                            <separator string="Produced Products"/>
+                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                     <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_qty" readonly="1" string="Quantity"/>
                                     <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                     <field name="prodlot_id" context="{'product_id': product_id}"/>
@@ -722,7 +725,6 @@
                                         states="done,cancel" />
                                 </tree>
                             </field>
-                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"
@@ -732,7 +734,7 @@
                                 <form string="Production Work Centers" version="7.0">
                                     <group col="4">
                                         <field colspan="4" name="name"/>
-                                        <field name="workcenter_id" widget="selection"/>
+                                        <field name="workcenter_id"/>
                                         <field name="sequence"/>
                                         <field name="cycle"/>
                                         <field name="hour"/>
@@ -741,7 +743,7 @@
                                 <tree string="Production Work Centers">
                                     <field name="sequence"/>
                                     <field name="name"/>
-                                    <field name="workcenter_id" widget="selection"/>
+                                    <field name="workcenter_id"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
                                 </tree>
@@ -755,12 +757,16 @@
                         </page>
                         <page string="Extra Information">
                             <group col="4">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <group>
                                 <field name="priority"/>
                                 <field name="date_start"/>
                                 <field name="date_finished"/>
-                                <field name="picking_id"/>
-                                <field name="move_prod_id"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="picking_id"/>
+                                    <field name="move_prod_id"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..22f71421ec9 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -80,7 +80,7 @@
             <sheet string="Work Orders">
                 <group col="4">
                     <field colspan="4" name="name"/>
-                    <field name="workcenter_id" widget="selection"/>
+                    <field name="workcenter_id"/>
                     <field name="production_id"/>
                     <field name="production_state"/>
                     <field name="sequence"/>
@@ -350,7 +350,7 @@
         <field name="model">mrp.production</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="priority" position="after">
+            <field name="date_finished" position="after">
                 <field name="allow_reorder"/>
             </field>
         </field>
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 840c33770a7..7397edbec2b 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
         return res
 
     _columns = {
-        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
-        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sales order.'),
+        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
 mrp_production()
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index fbf2e7a9327..882663680c5 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -8,10 +8,12 @@
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='move_prod_id']" position="after">
-                    <field name="sale_name"/>
+                <xpath expr="//field[@name='company_id']" position="after">
                     <field name="sale_ref"/>
                 </xpath>
+                <xpath expr="//field[@name='sale_ref']" position="after">
+                    <field name="sale_name"/>
+                </xpath>
             </field>
         </record>
 

From 1a944c6c29dc0cc269de254b8a079dc0aae53bb8 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 18:08:22 +0530
Subject: [PATCH 106/397] [IMP] workcenter and rounting view change

bzr revid: kjo@tinyerp.com-20120622123822-3o2d1npxrfy40xr1
---
 addons/mrp/mrp_view.xml | 44 +++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 456cd5cbed8..9ac5e5f6e99 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -113,12 +113,14 @@
             action="mrp_property_action"
             id="menu_mrp_property_action"
             groups="product.group_mrp_properties"
-            parent="menu_mrp_property"/>
+            parent="menu_mrp_configuration"
+            sequence="30" />
         <menuitem
             action="mrp_property_group_action"
-            parent="menu_mrp_property"
-            groups="product.group_mrp_properties"
-            id="menu_mrp_property_group_action"/>
+            parent="menu_mrp_configuration"
+            groups="base.group_no_one"
+            id="menu_mrp_property_group_action"
+            sequence="35" />
 
         <!--
         Work Centers
@@ -144,12 +146,16 @@
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="active"/>
-                        <field name="resource_type"/>
-                        <field name="calendar_id" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="resource_type"/>
+                            <field name="calendar_id" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="active"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="General Information">
@@ -251,11 +257,15 @@
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="active"/>
-                        <field name="location_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="location_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
+                       </group>
                     </group>
                     <notebook>
                         <page string="Work Center Operations">
@@ -483,7 +493,7 @@
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
-            parent="menu_mrp_bom"
+            parent="menu_mrp_configuration"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
@@ -976,7 +986,7 @@
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
-        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_bom" sequence="25"/>
+        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_configuration" sequence="25"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
 

From 36e94e982d9cac8abc4291425c8bfd1c0a6f720b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 22 Jun 2012 19:15:17 +0530
Subject: [PATCH 107/397] [IMP] bom view change

bzr revid: kjo@tinyerp.com-20120622134517-ewlgnn3w7veps9wi
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9ac5e5f6e99..7530c104e52 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -350,8 +350,8 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <field name="product_uos_qty" groups="product.group_uos" />
-	                            <field name="product_uos"  groups="product.group_uos"/>
+                                <field name="product_uos_qty" groups="product.group_uos" nolabel="1"/>
+                                <field name="product_uos"  groups="product.group_uos" nolabel="1"/>
 	                        </group>
 	                    </group>
 	                    <notebook>

From 74b1e9d77033597356955d60d3125bed28a717b6 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 11:24:11 +0530
Subject: [PATCH 108/397] [IMP] set button on top

bzr revid: kjo@tinyerp.com-20120625055411-zod3eaopqihynuf1
---
 addons/mrp/mrp_view.xml                       | 18 ++++++++++++++----
 addons/mrp_operations/mrp_operations_view.xml | 11 +++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7530c104e52..2b2e073dd4f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -350,8 +350,13 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="product_uos_qty" groups="product.group_uos" nolabel="1"/>
-                                <field name="product_uos"  groups="product.group_uos" nolabel="1"/>
+	                            <label name="product_uso_qty" />
+                                <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                                </div>
 	                        </group>
 	                    </group>
 	                    <notebook>
@@ -645,8 +650,13 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="product_uos_qty" groups="product.group_uos"/>
-                            <field name="product_uos" groups="product.group_uos"/>
+                            <label name="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            </div>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 22f71421ec9..d4d1802eb6c 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,17 +8,16 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='hour']" position="after">
-               <group colspan="8" col="8">
-                   <separator colspan="8"/>
-                   <field name="state"/>
+           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
+            <header colspan="8">
+                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
-                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
-               </group>
+                   <field name="state" widget="statusbar"/>
+            </header>
            </xpath>
         </field>
     </record>

From 41547d5942d1a945a7cb8af9b8434c8161f9e28a Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 25 Jun 2012 11:43:43 +0530
Subject: [PATCH 109/397] [IMP]customers-sales-receipt

bzr revid: pja@tinyerp.com-20120625061343-oxbyvom0a37qtcez
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5de7636c0c1..1365a24051f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -96,15 +96,15 @@
                     <group>
                         <group>
                             <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                            <field name="name" colspan="2"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
                             <field name="currency_id"/>
                             <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="name" colspan="2"/>
                             <field name="account_id"
                                  attrs="{'invisible':[('pay_now','!=','pay_now')]}"
                                   domain="[('type','=','liquidity')]"/>

From edfd2c18f067868261f346dae0b0088617b65696 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 11:49:50 +0530
Subject: [PATCH 110/397] [IMP] remove string

bzr revid: kjo@tinyerp.com-20120625061950-nw23wvb4zcu86dzh
---
 addons/mrp/mrp_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2b2e073dd4f..6a53efa4f0b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -697,7 +697,7 @@
                                 <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Quantity"/>
+                                       <field name="product_qty" readonly="1"/>
                                        <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
@@ -715,7 +715,7 @@
                             <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty"  string="Quantity"/>
+                                    <field name="product_qty"/>
                                     <field name="product_uom"  string="Unit of Measure"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.action_partial_move_server)d"
@@ -732,7 +732,7 @@
                             <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                     <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1" string="Quantity"/>
+                                    <field name="product_qty" readonly="1"/>
                                     <field name="product_uom" readonly="1" string="Unit of Measure"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                     <field name="prodlot_id" context="{'product_id': product_id}"/>

From f1957e856384abfaba18bf82750e7daee19e5f02 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 25 Jun 2012 11:59:19 +0530
Subject: [PATCH 111/397] [IMP]customers-sales-receipt

bzr revid: pja@tinyerp.com-20120625062919-lawo5zyr8i4zn8jc
---
 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 9ca30aed099..1e882b7c585 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -260,7 +260,7 @@ class account_voucher(osv.osv):
             ('receipt','Receipt'),
         ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
         'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
-        'date':fields.date('Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
+        'date':fields.date('Bill Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),

From 44f45e3922bd94ae2557006f8a1944699dafe5b1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 12:26:27 +0530
Subject: [PATCH 112/397] [IMP] change menu name

bzr revid: kjo@tinyerp.com-20120625065627-09700e1rk8hapwah
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6a53efa4f0b..15255d6637b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -32,7 +32,7 @@
             </field>
         </record>
         <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Groups</field>
+            <field name="name">Property Group</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
@@ -986,7 +986,7 @@
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
-            <field name="name">Work Centers</field>
+            <field name="name">Work Center</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.workcenter</field>
             <field name="view_type">form</field>

From bb4240fc56964c5e4c775e53feb245efdb681843 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Mon, 25 Jun 2012 14:55:40 +0530
Subject: [PATCH 113/397] [IMP] improve the customer and supplier invoice and
 refunds form

bzr revid: nco@tinyerp.com-20120625092540-m7243o1kkdcg1l62
---
 addons/account/account_invoice_view.xml       | 83 ++++++++++---------
 .../account_asset_invoice_view.xml            |  2 +-
 .../account_invoice_layout_view.xml           |  2 +-
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 68a723aa4a0..7ac6e6154ab 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,6 +53,7 @@
                 <form string="Invoice Line" version="7.0">
                     <group col="4">
                         <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                         <field name="name"/>
                         <label string="Quantity" for="quantity" align="1.0"/>
                         <div>
@@ -60,12 +61,11 @@
                             <field name="uos_id" class="oe_inline"
                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         </div>
-                        <field name="price_unit"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="discount"/>
-                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        <field name="price_unit"/>
+                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                        <field name="discount"/>
+                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
@@ -156,33 +156,42 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
-                        <group>
-                            <field string="Supplier" name="partner_id"
+                	<h1>
+                		<label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                		<label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
+                		<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                		<field name="number" readonly="1" class="oe_inline"/>
+            		</h1>
+                    <label string="Concerns" for="origin" class="oe_edit_only"/>
+                    <h2>
+                        <field name="origin" placeholder="PO 002"/>
+                        <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="number"/>
-                            <field name="date_invoice"/>
-                            <field name="period_id" domain="[('state', '=', 'draft')]"
-                                groups="account.group_account_user" widget="selection"/>
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
-                                groups="account.group_account_user"/>
-                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
-                                name="account_id" groups="account.group_account_user"/>
-                            <field name="currency_id"/>
-                            <field name="type" invisible="1"/>
-                        </group>
-                        <group>
-                            <label for="reference"/>
+                    </h2>
+                    <group>
+                    	<group>
+	                    	<field name="date_invoice"/>
+	                    	<field name="date_due"/>
+	                    	<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+	                        <label for="reference"/>
                             <div>
                                 <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
-                            <field name="date_due"/>
+                        </group>
+                        <group>
+                        	<field name="fiscal_position" widget="selection"/>
+                        	<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
+	                                groups="account.group_account_user"/>
+	                        <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
+	                                name="account_id" groups="account.group_account_user"/>
+                            <field name="currency_id"/>
+                           
+                        </group>
+                        <group>
+                            <field name="type" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -232,15 +241,13 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
-                                <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                            	<field name="payment_term" widget="selection"/>
+                            	<field name="user_id"/>
+                            	<field name="move_id" groups="account.group_account_user"/>
+                            	<field name="name"/>
+                                <field name="period_id" domain="[('state', '=', 'draft')]"
+                                groups="account.group_account_user" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                <newline/>
-                                <field name="payment_term" widget="selection"/>
-                                <field name="name"/>
-                                <newline/>
-                                <field name="origin" placeholder="PO0025"/>
-                                <field name="user_id"/>
-                                <field name="move_id" groups="account.group_account_user"/>
                             </group>
                         </page>
                         <page string="Payments">
@@ -364,16 +371,14 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
+                            	<field name="user_id"/>
+                            	<field name="origin" placeholder="SO0032"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                <newline/>
                                 <field name="date_due"/>
-                                <field name="user_id"/>
-                                <newline/>
-                                <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
-                                <field name="origin" placeholder="SO0032"/>
                                 <field name="move_id" groups="account.group_account_user"/>
+                                <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
                             </group>
-                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
+                            <field name="comment" placeholder="Terms and Conditions..."/>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index fe1435d4745..4af0c6568fe 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="account_id" position="after">
+            <field name="name" position="after">
                 <field name="asset_category_id"/>
             </field>
         </field>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index e9789b8199e..7cf4c0a821a 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="name" position="before">
+                <field name="product_id" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
                     <field name="sequence"/>
                 </field>

From e645dc56beebd2a7812c492c4e84198f07093e86 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 25 Jun 2012 18:09:13 +0530
Subject: [PATCH 114/397] [IMP] improve customer payment

bzr revid: shp@tinyerp.com-20120625123913-cojrmo49t7bkmtx6
---
 addons/account_voucher/account_voucher.py      | 11 +++++++++++
 .../account_voucher/account_voucher_view.xml   |  6 ++++--
 .../voucher_payment_receipt_view.xml           | 18 ++++++++++++++----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..3bf03b244c8 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -53,6 +53,15 @@ class account_voucher(osv.osv):
             res[voucher.id] = paid
         return res
 
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            for line in voucher.line_cr_ids:
+                amount += line.amount
+            res[voucher.id] = amount
+        return res
+
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -312,6 +321,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -1337,6 +1347,7 @@ class account_voucher_line(osv.osv):
         'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
         'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
+       
     }
     _defaults = {
         'name': '',
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..cfb61e09cf9 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -53,11 +53,13 @@
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                        <field name="name"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="reference"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       
+                       
                         <field name="account_id" widget="selection" invisible="True"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index cfed906e431..93f083fda17 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -304,6 +304,7 @@
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
+                        customer
                             <label for="parter_id" /> 
                         </div>
                         <h1>
@@ -312,12 +313,13 @@
                     </div>
                     <div>
                         Pay
+                      <h2>
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
                             class="oe_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                        by
+                         by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
@@ -325,14 +327,15 @@
                             class="oe_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
+                         </h2>
 
                     </div>
 
                     <group col="6">
                         <field name="currency_id" invisible="1"/>
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                          <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
-                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
@@ -376,7 +379,7 @@
                             </field>
                             <group col="3">
                                 <group col="2" string="Internal Notes">
-                                    <field name="narration" colspan="2" nolabel="1"/>
+                                    <field name="narration" colspan="2" nolabel="1" placeholder="Add an internal note"/>
                                 </group>
                                 <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
@@ -385,6 +388,7 @@
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
+                                <group>
                                 <group col="2">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="writeoff_amount"/>
@@ -396,8 +400,13 @@
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                     <field name="analytic_id"
                                            groups="analytic.group_analytic_accounting"/>
-                                </group>
+                                </group>  
+                                <group class="oe_subtotal_footer">
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                            	</group>
+                            	</group>
                             </group>
+                            
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
@@ -425,6 +434,7 @@
                         </page>
                     </notebook>
                     </sheet>
+                    
                 </form>
             </field>
         </record>

From 6b7047c9c4880802d56065f5bf4ff426dc43b331 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 18:18:04 +0530
Subject: [PATCH 115/397] [IMP] improved views of account_asset module and also
 added function for Entries feature

bzr revid: bde@tinyerp.com-20120625124804-37hru51o1uyaop3n
---
 addons/account_asset/account_asset.py       | 22 +++++--
 addons/account_asset/account_asset_view.xml | 63 +++++++++++++++------
 2 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 0799a59a423..27a58d3079b 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -213,13 +213,13 @@ class account_asset_asset(osv.osv):
 
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
-        'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'category_id': fields.many2one('account.asset.category', 'Asset Category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}),
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
         'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -316,6 +316,16 @@ class account_asset_asset(osv.osv):
         asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context)
         self.compute_depreciation_board(cr, uid, [asset_id], context=context)
         return asset_id
+    
+    def open_entries(self, cr, uid, ids, context=None):
+        return {
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.move.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'context':{'search_default_asset_id': ids, 'default_asset_id': ids},
+        }
 
 account_asset_asset()
 
@@ -331,12 +341,12 @@ class account_asset_depreciation_line(osv.osv):
 
     _columns = {
         'name': fields.char('Depreciation Name', size=64, required=True, select=1),
-        'sequence': fields.integer('Sequence of the depreciation', required=True),
+        'sequence': fields.integer('Sequence', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount to Depreciate', required=True),
-        'depreciated_value': fields.float('Amount Already Depreciated', required=True),
+        'remaining_value': fields.float('Amount to depreciate', required=True),
+        'depreciated_value': fields.float('Amount already depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 8efe929e471..a126f6d1173 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -70,7 +70,7 @@
             </search>
         </field>
     </record>
-
+    
     <!--
         Asset
      -->
@@ -88,28 +88,40 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <label for="name"/>
-                    <h1><field name="name"/></h1>
+                    <div>
+                        <label for="name"/>
+                        <h1>
+                            <field name="name" class="oe_inline"/> -
+                            <field name="code" class="oe_inline" placeholder="Reference"/>
+                            <button name="open_entries" string="Entries" type="object"/>
+                        </h1>
+                    </div>
                     <label for="category_id"/>
                     <h2><field name="category_id" on_change="onchange_category_id(category_id)"/></h2>
+                    <group>
+                        <group col="2">
+                            <field name="parent_id"/>
+                            <field name="partner_id"/>
+                        </group>
+                        <group col="2">
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
+                            <field name="purchase_date"/>
+                            <field name="currency_id"/>
+                            
+                        </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="General">
                         <group>
-                            <group>
-                                <field name="code"/>
-                                <field name="company_id" widget="selection"
-                                   groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
-                            </group>
                             <group>
                                 <field name="purchase_value"/>
                                 <field name="salvage_value"/>
                                 <field name="value_residual"/>
-                                <field name="currency_id"/>
                             </group>
                             <group>
-                                <field name="partner_id"/>
-                                <field name="purchase_date"/>
-                                <field name="parent_id"/>
+                                <field name="method"/>
+                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
                             </group>
                             <group>
                                 <field name="method_time" on_change="onchange_method_time(method_time)"/>
@@ -118,11 +130,6 @@
                                 <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                                 <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
                             </group>
-                            <group>
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                            </group>
                         </group>
                         </page>
                         <page string="Depreciation Board">
@@ -137,11 +144,31 @@
                                   <field name="parent_state" invisible="1"/>
                                   <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
                                </tree>
+                               <form string="Depriciation Lines"> 
+                                   <group>
+                                       <group col="2">
+                                           <field name="asset_id" invisible="1"/>
+                                           <field name="parent_state" invisible="1"/>
+                                           <field name="name"/>
+                                           <field name="amount"/>
+                                           <field name="move_id"/>
+                                           <field name="move_check"/>
+                                           <field name="parent_state" invisible="1"/>
+                                       </group>
+                                       <group col="2">
+                                           <field name="sequence"/>
+                                           <field name="depreciation_date"/>
+                                           <field name="depreciated_value" readonly="1"/>
+                                           <field name="remaining_value" readonly="1"/>
+                                       </group>
+                                   </group>
+                               </form>
                                <graph type="bar">
                                   <field name="name"/>
                                   <field name="amount"/>
                                   <field name="depreciated_value"/>
                                </graph>
+                             
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -157,7 +184,7 @@
            </form>
        </field>
     </record>
-
+    
     <record model="ir.ui.view" id="view_account_asset_asset_tree">
         <field name="name">account.asset.asset.tree</field>
         <field name="model">account.asset.asset</field>

From fb838181dab5069d838a34d2517a2d4bb6dd7744 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 19:03:53 +0530
Subject: [PATCH 116/397] [IMP] improved the views of Periodical
 Processing/Recurring Entries/ Define Recurring Entries and Genereate entries
 menus

bzr revid: bde@tinyerp.com-20120625133353-6ncjph9hijgpsxop
---
 addons/account/account.py                             |  2 +-
 addons/account/account_view.xml                       | 11 ++++-------
 .../account/wizard/account_subscription_generate.py   |  2 +-
 .../wizard/account_subscription_generate_view.xml     |  3 ---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..1804c7835ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2347,7 +2347,7 @@ class account_subscription(osv.osv):
         'ref': fields.char('Reference', size=16),
         'model_id': fields.many2one('account.model', 'Model', required=True),
         'date_start': fields.date('Start Date', required=True),
-        'period_total': fields.integer('Number of Periods', required=True),
+        'period_total': fields.integer('Number of Period(s)', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..18b5e88899b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1830,22 +1830,19 @@
                     </header>
                     <sheet>
                         <group>
-                            <group>
+                            <group col="2">
                                 <field name="name"/>
                                 <field name="model_id"/>
                                 <field name="ref"/>
                             </group>
-                            <newline/>
     
-                            <group string="Starts on">
+                            <group col="2">
                                 <field name="date_start"/>
+                                <field name="period_type"/>
+                                <field name="period_nbr"/>
                                 <field name="period_total"/>
                             </group>
     
-                            <group string="Valid Up to">
-                                <field name="period_nbr"/>
-                                <field name="period_type"/>
-                            </group>
                         </group>
                         <separator string="Subscription Lines"/>
                         <field name="lines_id" widget="one2many_list"/>
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 8efcd25b789..dc5209ebea0 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -28,7 +28,7 @@ class account_subscription_generate(osv.osv_memory):
     _name = "account.subscription.generate"
     _description = "Subscription Compute"
     _columns = {
-       'date': fields.date('Date', required=True),
+       'date': fields.date('Generate Entries Before', required=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bf848bb3776..bd5ba404cdd 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -9,12 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
                     </header>
-                    <separator string="Generate Entries before:"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>

From 37dc334f0c32cbccf44a5d555982b3300ca01776 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Mon, 25 Jun 2012 19:07:05 +0530
Subject: [PATCH 117/397] [IMP] improve the supplier payment and write check
 view.

bzr revid: nco@tinyerp.com-20120625133705-z4v609vb7wkr46ta
---
 .../account_voucher_view.xml                  | 146 +++++++++++++++++-
 addons/account_voucher/account_voucher.py     |  14 +-
 .../voucher_payment_receipt_view.xml          |  11 +-
 3 files changed, 161 insertions(+), 10 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index b53bdc35468..7573218229f 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -2,14 +2,12 @@
 <openerp>
     <data>
 
-        <!-- Supplier voucher view -->
-        
-        <record model="ir.ui.view" id="view_vendor_payment_check_form">
-            <field name="name">account.voucher.payment.check.form</field>
-            <field name="model">account.voucher</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
+
+   <!--   <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
+            	<h1 position="replace">
+                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+            	</h1>
                 <field name="journal_id" position="after">
                     <newline/>
                     <field name="allow_check" invisible="1"/>
@@ -22,7 +20,141 @@
                 <button name="proforma_voucher" position="after">
                     <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
                 </button>
+            </field> -->
+
+
+        <!-- Supplier voucher view -->
+        
+        <record model="ir.ui.view" id="view_vendor_payment_check_form">
+            <field name="name">account.voucher.payment.check.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form version="7.0">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet string="Bill Payment">
+                    <group col="4">
+                    	<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+                    	<field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            invisible="context.get('line_type', False)"
+                            widget="selection"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                            string="Payment Method"/>
+	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> 
+	                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>    
+                        <field name="allow_check" invisible="1"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="account_id"
+                            widget="selection"
+                            invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
+                        <field name="type" invisible="True"/>
+                        <field name="currency_id" invisible="1" colspan="4"/>
+                    </group>
+                    <notebook>
+                        <page string="Payment Information">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        />
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        />
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <group class="oe_subtotal_footer">
+	                        		<field name="amount_total" class="oe_subtotal_footer_separator"/>
+	                        	</group>
+                            <group>
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group>
+                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="4"/>
+                                        <field name="is_multi_currency" invisible="1"/>
+                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                    </group>
+                                    <group col="2">
+                                        <separator string="Payment Options" colspan="2"/>
+                                        <field name="writeoff_amount"/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                                   <field name="amount_currency"/>
+                                   <field name="currency_id"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    </sheet>
+                </form>
             </field>
+       
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9ca30aed099..f7f18f89d3e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,7 +247,18 @@ class account_voucher(osv.osv):
                     rate = voucher_rate * company_currency_rate
             res[voucher.id] =  voucher.amount / rate
         return res
-
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        print ids, "\n name ",name, "\n args ::> ", args, "\n context ::> ",context
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            print "voucher :> ",voucher 
+            for line in voucher.line_dr_ids:
+                print "line :> ",line
+                amount += line.amount
+                print "amount ::>>  ",amount
+            res[voucher.id] = amount
+        return res
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -312,6 +323,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index cfed906e431..ac3bbe93fbb 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -150,8 +150,10 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
-                    <group col="6">
-                        <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+                	<h1>
+                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
+            		</h1>
+                    <group col="4">
                         <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
@@ -204,6 +206,9 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
+                            <group class="oe_subtotal_footer">
+	                        	<field name="amount_total" class="oe_subtotal_footer_separator"/>
+	                        </group>
                             <group>
                                 <group string="Internal Notes">
                                     <field name="narration" colspan="2" nolabel="1"/>
@@ -228,7 +233,9 @@
                                         <field name="analytic_id"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
+	                                
                                 </group>
+                                
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

From 20a04f01de32be4bb203275b2504c5cf11c71a34 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 11:11:14 +0530
Subject: [PATCH 118/397] [IMP] improve view for supplier payment and write
 checks.

bzr revid: nco@tinyerp.com-20120626054114-nh23jv8dyu98areu
---
 addons/account_check_writing/account_voucher_view.xml   | 7 +++----
 addons/account_voucher/account_voucher.py               | 8 ++------
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 7573218229f..d52a595796e 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -96,9 +96,9 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        		<field name="amount_total" class="oe_subtotal_footer_separator"/>
-	                        	</group>
+                            <group class="oe_subtotal_footer oe_right">
+	                        		<field name="amount_line_total" class="oe_subtotal_footer_separator"/>
+	                        </group>
                             <group>
                                 <group string="Internal Notes">
                                     <field name="narration" colspan="2" nolabel="1"/>
@@ -154,7 +154,6 @@
                     </sheet>
                 </form>
             </field>
-       
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f7f18f89d3e..21b0a785da6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -247,16 +247,12 @@ class account_voucher(osv.osv):
                     rate = voucher_rate * company_currency_rate
             res[voucher.id] =  voucher.amount / rate
         return res
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        print ids, "\n name ",name, "\n args ::> ", args, "\n context ::> ",context
+    def _amount_total(self, cr, uid, ids, name, args, context=None):
         res = {}
         amount = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            print "voucher :> ",voucher 
             for line in voucher.line_dr_ids:
-                print "line :> ",line
                 amount += line.amount
-                print "amount ::>>  ",amount
             res[voucher.id] = amount
         return res
     _name = 'account.voucher'
@@ -323,7 +319,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
-        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
+        'amount_line_total': fields.function(_amount_total, digits_compute=dp.get_precision('Account'), string='Invoice Total'),
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ac3bbe93fbb..49e989aac00 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -206,8 +206,8 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
-	                        	<field name="amount_total" class="oe_subtotal_footer_separator"/>
+                            <group class="oe_subtotal_footer oe_right">
+	                        	<field name="amount_line_total" class="oe_subtotal_footer_separator"/>
 	                        </group>
                             <group>
                                 <group string="Internal Notes">

From c6c9b565c197c6b7a3c5ea298e1daae58cf04718 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 12:44:45 +0530
Subject: [PATCH 119/397] [IMP] improved the view of account_budget module

bzr revid: bde@tinyerp.com-20120626071445-au3q28spbnm3hzhp
---
 addons/account_budget/account_budget_view.xml | 92 +++++++++++--------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 2e939ae7b58..21627b3c70d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -108,48 +108,66 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
-                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
-                    <button string="Done" name="done" states="validate" type="workflow"   />
-                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
-                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
-                </header>
-                <sheet string="Budget">
-                    <group col="4">
-                            <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
-                                <tree string="Budget Lines">
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="general_budget_id"/>
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="paid_date"/>
-                                    <field name="planned_amount" sum="Planned Amount"/>
-                                    <field name="practical_amount" sum="Practical Amount"/>
-                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
-                                    <field name="percentage"/>
-                                </tree>
-                                <form string="Budget Lines" version="7.0">
-                                    <group col="4">
+                    <header>
+                        <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                        <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                        <button string="Done" name="done" states="validate" type="workflow"   />
+                        <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                        <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                    </header>
+                    <sheet string="Budget">
+                        <group col="4">
+                            <group>
+                                <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </group>
+                            <group>
+                                <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <label for="date_from" string="Duration"/>
+                                <div>
+                                    <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> - 
+                                    <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
+                                </div>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Budget Lines">
+                                <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
+                                    <tree string="Budget Lines">
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                         <field name="general_budget_id"/>
                                         <field name="date_from"/>
                                         <field name="date_to"/>
                                         <field name="paid_date"/>
-                                        <field name="planned_amount"/>
-                                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                    </group>
-                                </form>
-                            </field>
-                        </group>
+                                        <field name="planned_amount" sum="Planned Amount"/>
+                                        <field name="practical_amount" sum="Practical Amount"/>
+                                        <field name="theoritical_amount" sum="Theoretical Amount"/>
+                                        <field name="percentage"/>
+                                    </tree>
+                                    <form string="Budget Lines" version="7.0">
+                                        <group col="4">
+                                            <group>
+                                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                                <field name="general_budget_id"/>
+                                                <field name="planned_amount"/>
+                                                <label for="date_from" string="Duration"/>
+                                                <div>
+                                                    <field name="date_from"/>-
+                                                    <field name="date_to"/>
+                                                </div>
+                                            </group>
+                                            <group>
+                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                                <field name="paid_date"/>
+                                            </group>
+                                        </group>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

From 5f4975106914ba8894eba3443284050f8ad907f3 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 14:43:10 +0530
Subject: [PATCH 120/397] [IMP] improve customer invoice view.

bzr revid: nco@tinyerp.com-20120626091310-5srg6va55n52rvxg
---
 addons/account/account_invoice_view.xml       | 33 +++++++++++--------
 .../account_asset_invoice_view.xml            |  2 +-
 .../account_invoice_layout.py                 |  2 +-
 .../account_invoice_layout_view.xml           |  2 ++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7ac6e6154ab..5eab7e62651 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -52,20 +52,25 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group col="4">
-                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="name"/>
-                        <label string="Quantity" for="quantity" align="1.0"/>
-                        <div>
-                            <field name="quantity" class="oe_inline"/>
-                            <field name="uos_id" class="oe_inline"
-                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        </div>
-                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        <field name="price_unit"/>
-                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        <field name="discount"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                    	<group>
+	                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        <field name="name"/>
+	                        <label string="Quantity" for="quantity" align="1.0"/>
+	                        <div>
+	                            <field name="quantity" class="oe_inline"/>
+	                            <field name="uos_id" class="oe_inline"
+	                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        </div>
+	                        <field name="price_unit"/>
+	                        <field name="discount"/>
+                        </group>
+                        
+                        <group>
+                        	<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                        	<field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        	<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                        	<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                        </group>
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index 4af0c6568fe..fe1435d4745 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="name" position="after">
+            <field name="account_id" position="after">
                 <field name="asset_category_id"/>
             </field>
         </field>
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 68ae537f20e..1336914fb35 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -160,7 +160,7 @@ class account_invoice_line(osv.osv):
                 ('line','Separator Line'),
                 ('break','Page Break'),]
             ,'Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
+        'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
         'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
     }
 
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 7cf4c0a821a..faaed1dfd79 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -11,6 +11,8 @@
             <field name="arch" type="xml">
                 <field name="product_id" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
+                </field>
+                <field name="account_id" position="before">
                     <field name="sequence"/>
                 </field>
             </field>

From 022d717f1016c3c040f33f69f6e27c31d0068cab Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 14:46:51 +0530
Subject: [PATCH 121/397] [IMP] improved views of menus under Periodical
 Processing from useability point of view

bzr revid: bde@tinyerp.com-20120626091651-4cugzyz1dj2n4mb1
---
 addons/account/account_view.xml               | 21 ++++++++++++-------
 .../wizard/account_fiscalyear_close_state.py  |  2 +-
 .../wizard/account_fiscalyear_close_state.xml |  4 +---
 .../wizard/account_fiscalyear_close_view.xml  |  2 --
 .../account_open_closed_fiscalyear_view.xml   |  1 -
 .../account/wizard/account_use_model_view.xml |  4 +---
 .../wizard/account_validate_move_view.xml     |  4 +---
 .../wizard/wizard_asset_compute_view.xml      |  3 ---
 .../wizard/account_followup_print.py          |  6 +++---
 .../wizard/account_followup_print_view.xml    | 15 +++++--------
 10 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 18b5e88899b..9a77a9286e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -105,13 +105,20 @@
                 </header>
                 <sheet>
                     <group col="4">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="fiscalyear_id" widget="selection"/>
-                        <field name="special"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="fiscalyear_id" widget="selection"/>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <field name="date_start"/>- 
+                                <field name="date_stop" nolabel="1"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="special"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..1d73c852a8d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -29,7 +29,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
     _description = "Fiscalyear Close state"
     _columns = {
        'fy_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
+                                 'Fiscal Year to Close', required=True, help="Select a fiscal year to close"),
     }
 
     def data_save(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index e141b4fc911..5c9e1dea50d 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,10 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
                 <header>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+                    <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
                 </header>
-                <separator string="Close states of Fiscal year and periods"/>
                 <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
                 <group>
                     <field name="fy_id"  domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index aa34fefd128..b27a0279fb3 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -9,9 +9,7 @@
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
                     <group col="4">
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a4e338f3b9e..6df9e848411 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </header>
                     <group>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 682236a0610..bf069b3f16b 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,12 +10,10 @@
             <form string="Create Entries From Models" version="7.0">
                 <header>
                     <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="This wizard will create recurring accounting entries"/>
                 <label string="Create manual recurring entries in a chosen journal."/>
                 <group>
-                    <field name="model"/>
+                    <field name="model" nolabel="1"/>
                 </group>
             </form>
             </field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 2ee826fe1f7..8f991257f9a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -11,9 +11,7 @@
             <form string="Post Journal Entries" version="7.0">
                 <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="Post Journal Entries of a Journal"/>
                 <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
                 <group>
                     <field name="journal_id"/>
@@ -24,7 +22,7 @@
         </record>
 
         <record id="action_validate_account_move" model="ir.actions.act_window">
-            <field name="name">Open Journal</field>
+            <field name="name">Post Journal Entries</field>
             <field name="res_model">validate.account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 5d2bc39a751..6c517d5ed14 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -9,10 +9,7 @@
                 <form string="Compute Asset" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <separator string="Post Depreciation Lines"/>
-                    <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 088ff868ca0..555ba1a34cf 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -31,7 +31,7 @@ class account_followup_print(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'date': fields.date('Follow-up Sending Date', required=True, help="This field allow you to select a forecast date to plan your follow-ups"),
-        'followup_id': fields.many2one('account_followup.followup', 'Follow-up', required=True),
+        'followup_id': fields.many2one('account_followup.followup', 'Follow-Up', required=True),
     }
 
     def _get_followup(self, cr, uid, context=None):
@@ -121,10 +121,10 @@ class account_followup_print_all(osv.osv_memory):
     _description = 'Print Followup & Send Mail to Customers'
     _columns = {
         'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True),
-        'email_conf': fields.boolean('Send email confirmation'),
+        'email_conf': fields.boolean('Send Email Confirmation'),
         'email_subject': fields.char('Email Subject', size=64),
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
-        'email_body': fields.text('Email body'),
+        'email_body': fields.text('Email Body'),
         'summary': fields.text('Summary', required=True, readonly=True),
         'test_print': fields.boolean('Test Print', help='Check if you want to print followups without changing followups level.')
     }
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 32b6383a8cc..9f0474ca8b7 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,13 +7,10 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                 </header>
-                <separator string="Send Follow-Ups"/>
-                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
@@ -23,7 +20,7 @@
         </record>
 
         <record id="action_account_followup_print" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print</field>
             <field name="view_type">form</field>
@@ -75,11 +72,10 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups" version="7.0">
+            <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">
@@ -91,7 +87,6 @@
                             <field name="partner_lang" colspan="4"/>
                             <field name="test_print" colspan="4"/>
                             <field name="email_subject" colspan="4"/>
-                            <separator string="Email Body" colspan="4" />
                             <field name="email_body" colspan="4" nolabel="1"/>
                         </group>
                         <group string="Legend">
@@ -126,7 +121,7 @@
         </record>
 
         <record id="action_account_followup_print_all" model="ir.actions.act_window">
-            <field name="name">Send followups</field>
+            <field name="name">Send Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print.all</field>
             <field name="view_type">form</field>

From 6ecc7cc97e31d4a38a6cc12195acb1966b3dc423 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 15:35:39 +0530
Subject: [PATCH 122/397] [IMP] improve the supplier payment and write check
 view.

bzr revid: nco@tinyerp.com-20120626100539-nu49v8dttvjs5r3t
---
 .../account_voucher_view.xml                  | 34 ++++++-------------
 .../voucher_payment_receipt_view.xml          | 22 +++++++-----
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index d52a595796e..8805bc4603b 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -2,28 +2,7 @@
 <openerp>
     <data>
 
-
-   <!--   <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
-            <field name="arch" type="xml">
-            	<h1 position="replace">
-                		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-            	</h1>
-                <field name="journal_id" position="after">
-                    <newline/>
-                    <field name="allow_check" invisible="1"/>
-                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
-                    <newline/>
-                </field>
-                <field name="number" position="replace">
-                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
-                </field>
-                <button name="proforma_voucher" position="after">
-                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
-                </button>
-            </field> -->
-
-
-        <!-- Supplier voucher view -->
+        <!-- Supplier write check view -->
         
         <record model="ir.ui.view" id="view_vendor_payment_check_form">
             <field name="name">account.voucher.payment.check.form</field>
@@ -48,8 +27,15 @@
                             widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> 
-	                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                    </group>
+                    <group>
+                    	<label for="amount" string="Total" class="oe_inline"/>
+	                    <div>
+	                        <field name="amount" class="oe_inline" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> -
+	                        <field name="amount_in_word" class="oe_inline" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="1"/> 
+	                    </div>
+                    </group>
+	                <group col="4">
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>    
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 49e989aac00..03cee6d6a14 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -150,17 +150,23 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Bill Payment">
+                	<label for="partner_id" class="oe_edit_only" string="Supplier"/>
                 	<h1>
                 		<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
             		</h1>
-                    <group col="4">
-                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                        <field name="journal_id"
-                            domain="[('type','in',['bank', 'cash'])]"
-                            invisible="context.get('line_type', False)"
-                            widget="selection"
-                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
-                            string="Payment Method"/>
+                    <h2>
+                    	Pay
+	                    <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" nolabel="1"/>
+    	                by
+    	                <field name="journal_id"
+                        domain="[('type','in',['bank', 'cash'])]"
+                        invisible="context.get('line_type', False)"
+                        widget="selection" class="oe_inline"
+                        on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                        nolabel="1" colspan="4"/>
+            		</h2>
+                    
+                   <group col="4">
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>

From e67936f82e2240451af68312522fa8c295fef5ad Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 26 Jun 2012 15:37:49 +0530
Subject: [PATCH 123/397] [IMP] improved the view of Payment Orders

bzr revid: bde@tinyerp.com-20120626100749-bhgyjcbn8qfp1ckx
---
 addons/account_payment/account_payment.py     | 10 ++++-----
 .../account_payment/account_payment_view.xml  | 22 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 80d7a5419e7..02d12a534db 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -87,9 +87,9 @@ class payment_order(osv.osv):
         return res
 
     _columns = {
-        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+        'date_scheduled': fields.date('Scheduled Date', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
         'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
-        'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
+        'mode': fields.many2one('payment.mode', 'Payment Mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('cancel', 'Cancelled'),
@@ -103,9 +103,9 @@ class payment_order(osv.osv):
             ('now', 'Directly'),
             ('due', 'Due date'),
             ('fixed', 'Fixed date')
-            ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
-        'date_created': fields.date('Creation date', readonly=True),
-        'date_done': fields.date('Execution date', readonly=True),
+            ], "Preferred Date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+        'date_created': fields.date('Creation Date', readonly=True),
+        'date_done': fields.date('Execution Date', readonly=True),
         'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
     }
 
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..0979ebe049e 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -113,16 +113,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order" layout="auto">
-                    <group col="4">
-                      <field name="reference"/>
-                      <field name="mode" widget='selection'/>
-                      <field name="user_id"/>
-                      <field name="date_prefered"/>
-                      <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-                      <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                          type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    <group>
+                        <group>
+                            <field name="reference"/>
+                            <field name="user_id"/>
+                            <field name="mode"/>
+                        </group>                        
+                        <group>
+                            <field name="date_prefered"/>
+                            <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}"/>
+                            <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        </group>
                     </group>
+                    <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                        type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     <field name="line_ids" context="{'order_id': active_id or False}" >
                         <form string="Payment Line" version="7.0">
                             <notebook>

From defc239d9537cef4099dcf0a6af0474a3d5358e8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 16:58:01 +0530
Subject: [PATCH 124/397] [IMP] remove the title "Change my Preferences" And
 rearrenge fields in preferences

bzr revid: fka@tinyerp.com-20120626112801-zw3n8auufwky5a3x
---
 openerp/addons/base/res/res_users_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 82093dadd4b..44e7e77c476 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,15 +202,15 @@
                         <h1>
                             <field name="name" readonly="1" class="oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1>
+                        </h1> 
+                    </div>
+                    <group col="4" string="Preferences">
+                        <field name="context_lang" readonly="0"/>
                         <label for="company_id" class="oe_edit_only"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
-                    </div>
-                    <group col="4" string="Preferences">
-                        <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">
@@ -222,7 +222,6 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
-            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From 6ccc52f380ea671bdbd44db12a8c2340b7e02444 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 18:52:58 +0530
Subject: [PATCH 125/397] [IMP] improve view of Cash Registers.

bzr revid: nco@tinyerp.com-20120626132258-u7ye84qw0yf4dajp
---
 addons/account/account_view.xml | 106 +++++++++++++++++---------------
 1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..5a6db76eb8c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2550,15 +2550,24 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <field name="user_id" readonly="1"/>
-                        <field name="period_id"/>
-                        <field name="currency" invisible="1"/>
-                    </group>
-
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                    	<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>	
+                    </h2>
+                	<group col="4">
+	                    <group>
+	                    	<field name="user_id" readonly="1"/>
+	                    	<field name="total_entry_encoding"/>
+	                   		<field name='company_id' widget="selection" groups="base.group_multi_company" />     
+	                    </group>
+						<group>
+                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
+                            <field name="closing_date" readonly="1"/>
+                            <field name="currency" invisible="1"/>
+	                   </group>
+                   </group>
                     <notebook>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
@@ -2591,51 +2600,52 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group>
-                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
-                                    <tree string = "Opening Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Opening Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
-                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
-                                    <tree string = "Closing Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Closing Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
+                            <group col="4">
+                            	<group>
+                            		<label for="starting_details_ids" string="Opening Operations"/><newline/>
+	                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
+	                                    <tree string = "Opening Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Opening Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+                                		<field name="balance_start" readonly="1" string="Total"/>
+                                	</group>
+                                </group>
+                                <group>
+                                	<label for="ending_details_ids" string="Closing Operations"/><newline/>
+	                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
+	                                    <tree string = "Closing Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Closing Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+	                                	<field name="balance_end_cash" invisible="1" string="Total"/>
+                                		<field name="balance_end" string="Total"/>
+			                        </group>
+	                            </group> 
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="3">
-                        <group string="Dates">
-                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
-                            <field name="closing_date" readonly="1"/>
-                        </group>
-                        <group string="Opening Balance">
-                            <field name="balance_start" readonly="1" string="Opening Balance"/>
-                            <field name="total_entry_encoding"/>
-                        </group>
-                        <group string="Closing Balance">
-                            <field name="balance_end"/>
-                            <field name="balance_end_cash"/>
-                        </group>
-                    </group>
                 </sheet>
                 </form>
             </field>

From df5b6a25aa1e1264335d0ef8929ac6546d711d94 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 27 Jun 2012 10:00:22 +0530
Subject: [PATCH 126/397] [REM]: Remove tab

bzr revid: atp@tinyerp.com-20120627043022-3lf3ljnu92syesyq
---
 addons/account/account_invoice_view.xml | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 16dd6d51866..75b31d94c0d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,22 +53,22 @@
                 <form string="Invoice Line" version="7.0">
                     <group>
                     	<group>
-	                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-	                        <field name="name"/>
-	                        <label string="Quantity" for="quantity" align="1.0"/>
-	                        <div>
-	                            <field name="quantity" class="oe_inline"/>
-	                            <field name="uos_id" class="oe_inline"
-	                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-	                        </div>
-	                        <field name="price_unit"/>
-	                        <field name="discount"/>
+                          <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                          <field name="name"/>
+                          <label string="Quantity" for="quantity" align="1.0"/>
+                          <div>
+                             <field name="quantity" class="oe_inline"/>
+                             <field name="uos_id" class="oe_inline"
+                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                          </div>
+                          <field name="price_unit"/>
+                          <field name="discount"/>
                         </group>
                         <group>
-                        	<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        	<field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        	<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        	<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                           <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                           <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                           <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         </group>
                     </group>
                     <separator string="Notes"/>

From 5fabd6fe48ef3d76892d8c09b197cebf4d520045 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 27 Jun 2012 10:32:16 +0530
Subject: [PATCH 127/397] [IMP] improve sales-receipt

bzr revid: pja@tinyerp.com-20120627050216-lf9nko3d1q3vqdj9
---
 addons/account_voucher/account_voucher.py        | 16 +++++++++++++---
 .../voucher_sales_purchase_view.xml              |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1e882b7c585..1eba8c5be9a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -52,7 +52,16 @@ class account_voucher(osv.osv):
                     paid = True
             res[voucher.id] = paid
         return res
-
+    def untaxed_amount(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        amount = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            for line in voucher.line_cr_ids:
+                amount += line.amount
+            res[voucher.id] = amount
+        return res
+ 
+    
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -312,6 +321,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_untaxed': fields.function(untaxed_amount, digits_compute=dp.get_precision('Account'), string='Untaxed'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -381,6 +391,7 @@ class account_voucher(osv.osv):
         return True
 
     def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
+        
         context = context or {}
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
@@ -398,7 +409,6 @@ class account_voucher(osv.osv):
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
             voucher_total += line_amount
-
         total = voucher_total
         total_tax = 0.0
         if tax_id:
@@ -415,7 +425,7 @@ class account_voucher(osv.osv):
 
         res.update({
             'amount':total or voucher_total,
-            'tax_amount':total_tax
+            'tax_amount':total_tax    
         })
         return {
             'value':res
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1365a24051f..0cb24c6d7e5 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -131,11 +131,12 @@
                                 </group>
                                 <group>
                                     <group class="oe_subtotal_footer" string="Total">
+                                       <field name="amount_untaxed"/>
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="tax_amount"/>
                                         <field name="amount" class="oe_subtotal_footer_separator" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
@@ -279,6 +280,7 @@
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </div>
                                     -->
+                                    
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"

From d05fd95f2bd4bc84072a3d024cb9e840ab6f1f66 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 27 Jun 2012 10:44:03 +0530
Subject: [PATCH 128/397] [IMP] remove the cancel button.

bzr revid: nco@tinyerp.com-20120627051403-73ioj2a70gflou79
---
 addons/account_coda/account_coda_wizard.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 91ba355ba65..91d493bcda9 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -11,7 +11,6 @@
         <form string="Import CODA File" version="7.0">
             <header>
                 <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
-                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>

From afebbef66cfe515615e0c60cf47f55a084306db4 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 11:28:20 +0530
Subject: [PATCH 129/397] [IMP] improved view of Chart of Accounts wizard

bzr revid: bde@tinyerp.com-20120627055820-396fiiqjw7s4obkg
---
 addons/account/wizard/account_chart_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 1ae294c3c0a..23688980389 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,12 +9,13 @@
                 <form string="Account charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <group colspan="4">
+                    <group col="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
+                        <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                    </group>
+                    <group>
                         <field name="target_move"/>
-                        <label align="0.7" colspan="4" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
                         <separator string="Periods" colspan="4"/>
                         <field name="period_from"/>
                         <field name="period_to"/>
@@ -24,7 +25,7 @@
         </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
-            <field name="name">Chart of Accounts</field>
+            <field name="name">Select an Accounting Setup</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -35,6 +36,7 @@
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
             id="menu_action_account_tree2"
+            name="Chart of Accounts"
             parent="account.menu_finance_charts" />
     </data>
 </openerp>

From 4c71e322175bdaf97e290fe690fd1ad8fd9e69ac Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 12:00:13 +0530
Subject: [PATCH 130/397] [IMP] improved view of chart of taxes wizard

bzr revid: bde@tinyerp.com-20120627063013-3w5rlcpb1th4kgi5
---
 addons/account/wizard/account_tax_chart_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 309af53ca17..8fa4cc8c3fe 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -10,11 +10,12 @@
                 <form string="Account tax charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
                     </header>
-                    <group>
+                    <group col="4">
                         <field name="period_id"/>
-                        <label colspan="4" string="(If you do not select period it will take all open periods)"/>
+                        <label string="(If you do not select period it will take all open periods)"/>
+                    </group>
+                    <group>
                         <field name="target_move"/>
                     </group>
                 </form>

From 67ebfdecae4a3fb754ead7a9347a6fead54fbf32 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 27 Jun 2012 12:04:57 +0530
Subject: [PATCH 131/397] [IMP] improve the journal entries view.

bzr revid: nco@tinyerp.com-20120627063457-1a5e2xflmbj2rmwl
---
 addons/account/account_view.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..a278253e370 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1274,15 +1274,19 @@
                 </header>
                 <sheet string="Journal Entries" layout="auto">
                     <group col="4">
-                        <field name="name" readonly="True"/>
-                        <field name="ref"/>
-                        <field name="journal_id"/>
-                        <field name="period_id"/>
-                        <field name="to_check"/>
-                        <field name="date"/>
-                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-                        <field name="partner_id" invisible="1"/>
-                        <field name="amount" invisible="1"/>
+                    	<group>
+                    		<field name="name" readonly="True"/>
+                    		<field name="journal_id"/>
+                        	<field name="period_id"/>
+                        	<field name="company_id" required="1" groups="base.group_multi_company"/>
+                        	<field name="partner_id" invisible="1"/>
+                    	</group>
+                    	<group>
+                    		<field name="ref"/>
+	                        <field name="date"/>
+	                        <field name="to_check"/>
+	                        <field name="amount" invisible="1"/>
+                    	</group>	
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Items">
@@ -1374,8 +1378,8 @@
                                     <field name="reconcile_partial_id"/>
                                 </tree>
                             </field>
-                            <separator string="Internal Note"/>
-                            <field name="narration" colspan="4" nolabel="1" height="50"/>
+                            <separator/>
+                            <field name="narration" colspan="4" placeholder="Add an internal note" nolabel="1" height="50"/>
                         </page>
                     </notebook>
                     </sheet>

From 127ae36646ad4ee3ee644ad473aa54c37060525c Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 27 Jun 2012 12:58:22 +0530
Subject: [PATCH 132/397] [IMP] improve sales-receipt

bzr revid: pja@tinyerp.com-20120627072822-z7a6i6li0c95gl9r
---
 addons/account_voucher/account_voucher.py             | 11 +----------
 .../account_voucher/voucher_sales_purchase_view.xml   | 10 ++++------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1eba8c5be9a..972e56d0bc9 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -52,15 +52,6 @@ class account_voucher(osv.osv):
                     paid = True
             res[voucher.id] = paid
         return res
-    def untaxed_amount(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        amount = 0.0
-        for voucher in self.browse(cr, uid, ids, context=context):
-            for line in voucher.line_cr_ids:
-                amount += line.amount
-            res[voucher.id] = amount
-        return res
- 
     
     def _get_type(self, cr, uid, context=None):
         if context is None:
@@ -321,7 +312,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
-        'amount_untaxed': fields.function(untaxed_amount, digits_compute=dp.get_precision('Account'), string='Untaxed'),
+        
     }
     _defaults = {
         'period_id': _get_period,
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0cb24c6d7e5..6657cd54e19 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,20 +130,19 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_subtotal_footer" string="Total">
-                                       <field name="amount_untaxed"/>
+                                    <group class="oe_subtotal_footer">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount"/>
                                         <field name="amount" class="oe_subtotal_footer_separator" />
-                                        <button type="object"
-                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                            attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </group>                                    
                                 </group>
                             </group>
+                            <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
@@ -280,7 +279,6 @@
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
                                     </div>
                                     -->
-                                    
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"

From 6bbb339b9f2a484990ee1db235a58b70e60c1bf7 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 16:42:52 +0530
Subject: [PATCH 133/397] [IMP]:improved view in new style

bzr revid: apa@tinyerp.com-20120627111252-j0dliz74sqlwg2v4
---
 addons/mrp/mrp_view.xml | 316 +++++++++++++++++++++-------------------
 1 file changed, 166 insertions(+), 150 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dab2a2da37a..3463f2c0d52 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -146,42 +146,44 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="resource_type"/>
-                            <field name="calendar_id" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="active"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="General Information">
+                    <sheet>
+                        <group col="4">
                             <group>
-                                <group string="Capacity Information">
-                                    <field name="time_efficiency"/>
-                                    <field name="capacity_per_cycle"/>
-                                    <field name="time_cycle" widget="float_time"/>
-                                    <field name="time_start" widget="float_time"/>
-                                    <field name="time_stop" widget="float_time"/>
-                                </group>
-                                <group string="Costing Information">
-                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                                    <field name="costs_hour"/>
-                                    <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_cycle"/>
-                                    <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                </group>
+                                <field name="name"/>
+                                <field name="resource_type"/>
+                                <field name="calendar_id" widget="selection"/>
                             </group>
-                            <label for="note"/>
-                            <field name="note"/>
-                        </page>
-                    </notebook>
+                            <group>
+                                <field name="code"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="General Information">
+                                <group>
+                                    <group string="Capacity Information">
+                                        <field name="time_efficiency"/>
+                                        <field name="capacity_per_cycle"/>
+                                        <field name="time_cycle" widget="float_time"/>
+                                        <field name="time_start" widget="float_time"/>
+                                        <field name="time_stop" widget="float_time"/>
+                                    </group>
+                                    <group string="Costing Information">
+                                        <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                        <field name="costs_hour"/>
+                                        <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_cycle"/>
+                                        <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                        <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                </group>
+                                <label for="note"/>
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -237,16 +239,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <group col="4" string="General Information">
-                        <field colspan="4" name="name"/>
-                        <field name="sequence"/>
-                        <field name="workcenter_id"/>
-                        <field name="cycle_nbr"/>
-                        <field name="hour_nbr" widget="float_time"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
-                    <label for="note"/>
-                    <field name="note"/>
+                    <sheet>
+                        <group col="4" string="General Information">
+                            <field colspan="4" name="name"/>
+                            <field name="sequence"/>
+                            <field name="workcenter_id"/>
+                            <field name="cycle_nbr"/>
+                            <field name="hour_nbr" widget="float_time"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <label for="note"/>
+                        <field name="note"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -257,25 +261,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="code"/>
+                    <sheet>
+                        <group col="4">
+                            <group>
+                                <field name="name"/>
+                                <field name="code"/>
+                            </group>
+                            <group>
+                                <field name="location_id"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="active"/>
+                           </group>
                         </group>
-                        <group>
-                            <field name="location_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active"/>
-                       </group>
-                    </group>
-                    <notebook>
-                        <page string="Work Center Operations">
-                           <field name="workcenter_lines"/>
-                        </page>
-                        <page string="Notes">
-                           <field name="note"/>
-                        </page>
-                    </notebook>
+                        <notebook>
+                            <page string="Work Center Operations">
+                                <field name="workcenter_lines"/>
+                                <label string="Notes"/>
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -350,12 +355,12 @@
 	                        <group>
 	                            <field name="type"/>
 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <label name="product_uso_qty" />
-                                <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+	                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                                <div groups="product.group_uos" >
+                                    <field name="product_uos_qty" 
+                                        class="oe_inline"/>
+                                    <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
+                                    <field name="product_uos" class="oe_inline"/>
                                 </div>
 	                        </group>
 	                    </group>
@@ -364,7 +369,7 @@
 	                            <field name="bom_lines" widget="one2many_list">
 	                                <tree string="Components" editable="bottom">
 	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-	                                    <field name="product_qty"/>
+	                                    <field name="product_qty" string="Product Quantity"/>
 	                                    <field name="product_uom"/>
 	                                    <field name="name" invisible="1"/>
 	                                    <field name="date_start"/>
@@ -459,7 +464,7 @@
                     <field name="code"/>
                     <field name="product_id" string="Component Product"/>
                     <field name="bom_id"/>
-                    <field name="product_qty"/>
+                    <field name="product_qty" string="Product Quantity"/>
                     <field name="product_uom"/>
                     <field name="type"/>
                     <field name="method"/>
@@ -650,12 +655,11 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <label name="product_uso_qty" />
-                            <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    class="oe_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
+                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                            <div groups="product.group_uos">
+                                <field name="product_uos_qty" class="oe_inline"/>
+                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
+                                <field name="product_uos" class="oe_inline"/>
                             </div>
                         </group>
                     </group>
@@ -669,82 +673,94 @@
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
-                             </group>
-                                <separator string="Products to Consume"/>
-                                <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                    <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
-                                        <field name="product_id" />
-                                        <field name="product_qty"  string="Quantity"/>
-                                        <field name="product_uom"  string="Unit of Measure"/>
-                                        <field name="location_id"  string="Source Loc."/>
-                                        <field name="state" invisible="1"/>
-                                        <button name="%(stock.move_consume)d"
-                                            string="Consume Products" type="action"
-                                            icon="gtk-go-forward" context="{'consume': True}"
-                                            states="draft,waiting,confirmed,assigned" />
-                                        <button
-                                               name="%(stock.track_line)d"
-                                               string="Split in Serial Numbers"
-                                               type="action" icon="gtk-justify-fill"
-                                               states="draft,waiting,confirmed,assigned" />
-                                        <button name="%(stock.move_scrap)d"
-                                            string="Scrap Products" type="action"
-                                            icon="gtk-convert" context="{'scrap': True}"
-                                            states="draft,waiting,confirmed,assigned"/>
-                                    </tree>
-                                </field>
-                                <separator string="Consumed Product"/>
-                                <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
-                                   <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
-                                       <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1"/>
-                                       <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                       <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                       <field name="state" invisible="1"/>
-                                       <field name="scrapped" invisible="1"/>
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action"
-                                           icon="gtk-convert"
-                                           states="done,cancel"/>
-                                   </tree>
-                                </field>
+                            </group>
+                            <group col="4">
+                                <group col="1" colspan="2">
+                                    <separator string="Products to Consume"/>
+                                    <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                        <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                            <field name="product_id" />
+                                            <field name="product_qty"  string="Quantity"/>
+                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="location_id"  string="Source Loc."/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.move_consume)d"
+                                                string="Consume Products" type="action"
+                                                icon="gtk-go-forward" context="{'consume': True}"
+                                                states="draft,waiting,confirmed,assigned" />
+                                            <button
+                                                   name="%(stock.track_line)d"
+                                                   string="Split in Serial Numbers"
+                                                   type="action" icon="gtk-justify-fill"
+                                                   states="draft,waiting,confirmed,assigned" />
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action"
+                                                icon="gtk-convert" context="{'scrap': True}"
+                                                states="draft,waiting,confirmed,assigned"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group col="1" colspan="2">
+                                    <separator string="Consumed Product"/>
+                                    <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                       <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
+                                           <field name="product_id" readonly="1"/>
+                                           <field name="product_qty" readonly="1"/>
+                                           <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                           <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                           <field name="state" invisible="1"/>
+                                           <field name="scrapped" invisible="1"/>
+                                           <button
+                                               name="%(stock.move_scrap)d"
+                                               string="Scrap Products" type="action"
+                                               icon="gtk-convert"
+                                               states="done,cancel"/>
+                                       </tree>
+                                    </field>
+                                </group>
+                            </group>
                         </page>
                         <page string="Finished Products">
-                            <separator string="Products to Produce"/>
-                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
-                                <tree string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"  string="Unit of Measure"/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.action_partial_move_server)d"
-                                        string="Partial"
-                                        type="action" states="confirmed,assigned"
-                                        icon="gtk-justify-fill"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                </tree>
-                            </field>
-                            <separator string="Produced Products"/>
-                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
-                                <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
-                                    <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1"/>
-                                    <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
-                                    <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.track_line)d"
-                                         string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action" icon="gtk-convert"
-                                        states="done,cancel" />
-                                </tree>
-                            </field>
+                            <group col="4">
+                                <group col="1" colspan="2">
+                                    <separator string="Products to Produce"/>
+                                    <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                        <tree string="Products to Finish">
+                                            <field name="product_id" />
+                                            <field name="product_qty"/>
+                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.action_partial_move_server)d"
+                                                string="Partial"
+                                                type="action" states="confirmed,assigned"
+                                                icon="gtk-justify-fill"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action"
+                                                icon="gtk-convert" context="{'scrap': True}"
+                                                states="draft,waiting,confirmed,assigned" />
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group col="1" colspan="2">
+                                    <separator string="Produced Products"/>
+                                    <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+                                            <field name="product_id" readonly="1"/>
+                                            <field name="product_qty" readonly="1"/>
+                                            <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                            <field name="scrapped" invisible="1"/>
+                                            <field name="state" invisible="1"/>
+                                            <button name="%(stock.track_line)d"
+                                                 string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action" icon="gtk-convert"
+                                                states="done,cancel" />
+                                        </tree>
+                                    </field>
+                                </group>
+                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"

From 0fd39ebd7e231b77312d5861f94302339ecf69f7 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 17:14:28 +0530
Subject: [PATCH 134/397] [IMP] improved bank statement view

bzr revid: bde@tinyerp.com-20120627114428-t1wtl2fkbfhedvj0
---
 addons/account/account_view.xml               | 19 +++++++++++++++----
 .../account_payment/account_payment_view.xml  |  6 +++---
 ...ccount_payment_populate_statement_view.xml |  1 -
 .../account_voucher/account_voucher_view.xml  |  6 +++---
 .../account_statement_from_invoice_view.xml   |  1 -
 addons/l10n_ch/wizard/bvr_import_view.xml     |  7 +++----
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..6c7c750a6cf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -598,14 +598,25 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                        
+                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    </div>
+                    
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>-
+                        <field name="period_id" class="oe_inline"/>
+                    </h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
+                    </h2>
                     <group>
                         <group>
-                            <field name="name"/>
                             <field name="date" on_change="onchange_date(date, company_id)"/>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                            <field name="period_id"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        </group><group>
+                        </group>
+                        <group>
                             <field name="balance_start"/>
                             <field name="balance_end_real"/>
                             <field name="currency" invisible="1"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index aa4cd18308f..f214930e230 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -330,9 +330,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="journal_id" position="after">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+                </xpath>      
             </field>
         </record>
 
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index afcaf82be3a..1e0ba141ff5 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -10,7 +10,6 @@
                 <form string="Populate Statement:" version="7.0">
                     <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                     </header>
                     <field name="lines"/>
                 </form>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..d2105c2d8a2 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -206,11 +206,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-              <field name="currency" invisible="1" position="after">
-                <button name="%(action_view_account_statement_from_invoice_lines)d"
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoices" type="action" icon="gtk-execute"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
-              </field>
+                </xpath>      
             </field>
         </record>
 
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 1c0c00bd662..9617e895920 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -42,7 +42,6 @@
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
                    </group>
                </form>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 6625aaef9cd..f7a1ace6614 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -10,7 +10,6 @@
                 <form string="BVR Import" version="7.0">
                     <header>
                         <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
                     </header>
                     <group>
                         <field name="file"/>
@@ -35,9 +34,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <field name="balance_end_real" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action" colspan="2"/>
-                </field>
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+                </xpath>
             </field>
         </record>
     </data>

From a4995d990278432308668325cf6d250257bc1167 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:23:20 +0530
Subject: [PATCH 135/397] [IMP] Add name in window

bzr revid: kjo@tinyerp.com-20120627115320-ip48sm1g564g6vir
---
 openerp/addons/base/res/res_users_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 44e7e77c476..edc680a1f22 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -222,6 +222,7 @@
             </field>
         </record>
         <record id="action_res_users_my" model="ir.actions.act_window">
+            <field name="name">Change My Preferences</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>

From a7df6d69e06bd9af556529b4d506197ecf14a860 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 17:45:39 +0530
Subject: [PATCH 136/397] [IMP] remove the header tag in company field

bzr revid: kjo@tinyerp.com-20120627121539-h46t0kev48tg4fql
---
 openerp/addons/base/res/res_users_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index edc680a1f22..fcb7a5b1a56 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -206,11 +206,8 @@
                     </div>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
-                        <label for="company_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="company_id" widget="selection" readonly="0"
-                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
-                        </h2>
+                        <field name="company_id" readonly="0"
+                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         <field name="context_tz" readonly="0"/>
                     </group>
                     <group string="Email Preferences">

From 29ae3ad12cf84d6087920a793e381dcd88ca053b Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 27 Jun 2012 18:42:13 +0530
Subject: [PATCH 137/397] [IMP] kept periods on single line

bzr revid: bde@tinyerp.com-20120627131213-h8lorzub169401gi
---
 addons/account/wizard/account_chart_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 23688980389..109fdc5b148 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,9 +16,11 @@
                     </group>
                     <group>
                         <field name="target_move"/>
-                        <separator string="Periods" colspan="4"/>
-                        <field name="period_from"/>
-                        <field name="period_to"/>
+                        <label for="period_from" string="Periods"/>
+                        <div>
+                            <field name="period_from" class="oe_inline"/>-
+                            <field name="period_to" class="oe_inline"/>
+                        </div>
                     </group>
                 </form>
             </field>

From 482b1ce9c6915a860e98d245a00f595c8bf3d340 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:46:27 +0530
Subject: [PATCH 138/397] [IMP] set class oe_inline to name

bzr revid: kjo@tinyerp.com-20120627131627-1qki2cpf7unxu2ht
---
 openerp/addons/base/res/res_users_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index fcb7a5b1a56..38d7526d6aa 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -198,12 +198,10 @@
                     <div class="oe_right oe_avatar">
                         <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
                     </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="name" readonly="1" class="oe_edit_only"/>
-                            (<field name="login" readonly="1" class="oe_edit_only"/>)
-                        </h1> 
-                    </div>
+                    <h1>
+                            <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
+                            (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
+                    </h1>
                     <group col="4" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"

From 30e94efedf649e6e5d259b8803cb0435d58f8bf2 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 28 Jun 2012 10:37:51 +0530
Subject: [PATCH 139/397] [IMP]purchase receipt view

bzr revid: pja@tinyerp.com-20120628050751-cde0pa09a28n0ux9
---
 .../account_voucher/voucher_sales_purchase_view.xml  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5de7636c0c1..a0e53bb1cc0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -236,21 +236,19 @@
                             <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
                             <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due"/>
-                            <field name="name" colspan="2"/>
-
+                            <field name="reference"/>
                         </group>
                         <group>
                             <field name="paid" invisible="1"/>
                             <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                            <field name="reference"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-
-                    </group>
+                            <field name="name" colspan="2"/>
+                    	</group>
+					</group>
                     <group col="6">
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>

From 0c797699436157d9496b393ce74322c2aa4c9041 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Thu, 28 Jun 2012 12:23:14 +0530
Subject: [PATCH 140/397] [IMP] improve journal voucher

bzr revid: shp@tinyerp.com-20120628065314-jdpxl38ol8xsl9z4
---
 .../account_voucher/account_voucher_view.xml  | 62 ++++++++++++-------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 6177da71eed..96adaadae4c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -50,16 +50,27 @@
                       <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </header>
                   <sheet string="Accounting Voucher">
-                    <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="type" required="1"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="reference"/>
-                        <field name="account_id" widget="selection" invisible="True"/>
-                    </group>
+                  	<h1>
+                  		<label for="number"/>
+                        <field name="number"   class="oe_inline"/>
+                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+                		<field name="type" required="1"  class="oe_inline"/>
+                		<span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+                	</h1>		
+                  <group>
+                  	<group>
+                  		<field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                  		<field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                  		<field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                  	</group>
+                  	<group>
+                  		 <field name="currency_id"/>
+                  		 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                  		 <field name="reference"/>
+                  		 <field name="name"/>
+                  	</group>
+                  </group>
+                   <field name="account_id" widget="selection" invisible="True"/>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -71,22 +82,25 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
+                           <group col="3">
+                            <div>
                                 <group string="Internal Notes">
-                                    <field name="narration" colspan="2" nolabel="1"/>
+                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal notes "/>
                                 </group>
-                                <group string="Other Information">
-                                    <field name="number"/>
-                                    <field name="currency_id"/>
-                                </group>
-                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                    <field name="tax_amount" nolabel="1"/>
-                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
-                                </group>
-                            </group>
+                                <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                             </div>
+                             <group>  
+                             	<group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer  oe_right">
+                             		<group>
+                                    	<field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                 	</group>
+                                 	<group>   
+                                    	<field name="tax_amount"/>
+                                    	<field name="amount" class="oe_subtotal_footer_separator"/>
+                                 	</group>  
+                             	</group>
+                           	</group>
+                         </group>  	
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">

From fc1610bedc90335f94b49c7ff08e2b49efc1b153 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 28 Jun 2012 13:08:49 +0530
Subject: [PATCH 141/397] [IMP] add cancel button.

bzr revid: nco@tinyerp.com-20120628073849-th08eklny1rwwnkz
---
 addons/account_coda/account_coda_wizard.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 91d493bcda9..91ba355ba65 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -11,6 +11,7 @@
         <form string="Import CODA File" version="7.0">
             <header>
                 <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
+                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
             </header>
             <group col="2" string="Select Your File :">
                 <field name="coda_data" filename="coda_fname"/>

From d1188ef84d6ad569a9447461cead96ede0756844 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 28 Jun 2012 15:10:10 +0530
Subject: [PATCH 142/397] [IMP] add cancel button in wizards.

bzr revid: nco@tinyerp.com-20120628094010-z4dlxcnt5tlt1cwq
---
 addons/account/wizard/account_chart_view.xml                   | 1 +
 addons/account/wizard/account_fiscalyear_close_state.xml       | 1 +
 addons/account/wizard/account_fiscalyear_close_view.xml        | 1 +
 addons/account/wizard/account_open_closed_fiscalyear_view.xml  | 1 +
 addons/account/wizard/account_subscription_generate_view.xml   | 1 +
 addons/account/wizard/account_tax_chart_view.xml               | 1 +
 addons/account/wizard/account_use_model_view.xml               | 1 +
 addons/account/wizard/account_validate_move_view.xml           | 1 +
 addons/account_asset/wizard/wizard_asset_compute_view.xml      | 1 +
 addons/account_followup/wizard/account_followup_print_view.xml | 2 ++
 10 files changed, 11 insertions(+)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 109fdc5b148..7bcbe5e3494 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -9,6 +9,7 @@
                 <form string="Account charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
                     <group col="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 5c9e1dea50d..0f116e07dbd 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -9,6 +9,7 @@
                 <form string="Close states of Fiscal year and periods" version="7.0">
                 <header>
                     <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
                 <group>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index b27a0279fb3..5ef53c42575 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -9,6 +9,7 @@
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 6df9e848411..f6723717e8a 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -9,6 +9,7 @@
                 <form string="Choose Fiscal Year " version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index bd5ba404cdd..961cfa01d61 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -11,6 +11,7 @@
                     <header>
                         <button icon="gtk-execute" string="Generate Entries"
                             name="action_generate" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="date"/>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 8fa4cc8c3fe..e0e2698a198 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -10,6 +10,7 @@
                 <form string="Account tax charts" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
                     <group col="4">
                         <field name="period_id"/>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index bf069b3f16b..00eb4676058 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -10,6 +10,7 @@
             <form string="Create Entries From Models" version="7.0">
                 <header>
                     <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <label string="Create manual recurring entries in a chosen journal."/>
                 <group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 8f991257f9a..1f11d40ac49 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -11,6 +11,7 @@
             <form string="Post Journal Entries" version="7.0">
                 <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
                 <group>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 6c517d5ed14..5e028a41473 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -9,6 +9,7 @@
                 <form string="Compute Asset" version="7.0">
                     <header>
                         <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group>
                         <field name="period_id"/>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 9f0474ca8b7..741fdd94cd9 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -10,6 +10,7 @@
             <form string="Send Follow-Ups" version="7.0">
                 <header>
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <group col="4">
                     <field name="followup_id"/>
@@ -76,6 +77,7 @@
                 <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
                     <button name="do_print" string="Print Follow-Ups" colspan="1" type="object" icon="gtk-print"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
                 <notebook>
                     <page string="Partner Selection">

From 87a8a5660f9712ffbbea78bcdaeba408c9804c89 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 28 Jun 2012 17:31:50 +0530
Subject: [PATCH 143/397] [IMP] arranged the buttons in Bank Statements

bzr revid: bde@tinyerp.com-20120628120150-9hr4a4iq85tcpsgq
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6c7c750a6cf..4f45ec79091 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -599,7 +599,7 @@
                 </header>
                 <sheet>
                         
-                    <div class="oe_right oe_button_box_new" name="import_buttons">
+                    <div class="oe_right oe_button_box" name="import_buttons">
                     </div>
                     
                     <label for="name" class="oe_edit_only"/>

From f99f476acbc1f78078f97ad56de07d27809a7520 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Jun 2012 21:37:59 +0530
Subject: [PATCH 144/397] [FIX]: Fix customer payment view

bzr revid: atp@tinyerp.com-20120628160759-hjqc2gep7p6on7a9
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5555f9f27f1..0a0eb9bf4de 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -394,17 +394,14 @@
                                 </tree>
                             </field>
                             <group>
-                                <group col="2">
-                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                                </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group  attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group col="2">
+                                <group>
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
@@ -417,6 +414,7 @@
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                             </group>
+                            <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">

From 5fe3d220292498c0a79a541d39cd630f88836f07 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Jun 2012 23:14:41 +0530
Subject: [PATCH 145/397] [FIX]:Fix in minor view

bzr revid: atp@tinyerp.com-20120628174441-w9228qfg8w5qw9z3
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0a0eb9bf4de..7c9ba177e70 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -394,15 +394,13 @@
                                 </tree>
                             </field>
                             <group>
-                                <group  attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                    <separator string="Currency Options" colspan="4"/>
+                                <group string="Currency Options" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group>
-                                    <separator string="Payment Options" colspan="2"/>
+                                <group string="Payment Options">
                                     <field name="writeoff_amount"/>
                                     <field name="payment_option" required="1"/>
                                     <field name="writeoff_acc_id"

From 42509288758294b4850df2adc68f231dbaa0bbf0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 11:44:54 +0530
Subject: [PATCH 146/397] [ADD]: Add untaxed amount in sales receipt and
 purchase receipt

bzr revid: atp@tinyerp.com-20120629061454-6cmayn8jx5cykhkv
---
 addons/account_voucher/account_voucher.py     | 61 ++++++++++++-------
 .../account_voucher/account_voucher_view.xml  |  1 +
 .../voucher_sales_purchase_view.xml           | 24 ++++----
 3 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c7749b317ac..6545990ba3a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -129,7 +129,6 @@ class account_voucher(osv.osv):
         journal_id = context.get('journal_id', False)
         if journal_id:
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
-            print "jpurnallll",journal
             if journal.currency:
                 return journal.currency.id
         return False
@@ -249,6 +248,22 @@ class account_voucher(osv.osv):
             res[voucher.id] =  voucher.amount / rate
         return res
 
+    def _amount_untaxed(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] = {
+                'amount_untaxed': 0.0,
+            }
+            for line in voucher.line_ids:
+                res[voucher.id]['amount_untaxed'] += line.untax_amount or line.amount
+        return res
+
+    def _get_voucher_line(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.voucher.line').browse(cr, uid, ids, context=context):
+            result[line.voucher_id.id] = True
+        return result.keys()
+   
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _inherit = ['mail.thread']
@@ -286,7 +301,7 @@ class account_voucher(osv.osv):
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
         'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_amount':fields.float('Tax', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
         'number': fields.char('Number', size=32, readonly=True,),
         'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -314,6 +329,12 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'amount_untaxed': fields.function(_amount_untaxed, digits_compute=dp.get_precision('Account'), string='Untaxed',
+            store={
+                'account.voucher': (lambda self, cr, uid, ids, c={}: ids, ['line_ids'], 20),
+                'account.voucher.line': (_get_voucher_line, ['amount', 'untax_amount '], 20),
+            },
+            multi='all'),
     }
     _defaults = {
         'period_id': _get_period,
@@ -350,28 +371,24 @@ class account_voucher(osv.osv):
         if context is None: context = {}
 
         for voucher in voucher_pool.browse(cr, uid, ids, context=context):
-            voucher_amount = 0.0
+            voucher_untax_amount = 0.0
             for line in voucher.line_ids:
-                voucher_amount += line.untax_amount or line.amount
+                voucher_untax_amount += line.untax_amount or line.amount
                 line.amount = line.untax_amount or line.amount
                 voucher_line_pool.write(cr, uid, [line.id], {'amount':line.amount, 'untax_amount':line.untax_amount})
-
             if not voucher.tax_id:
-                self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
+                self.write(cr, uid, [voucher.id], {'amount': voucher_untax_amount,  'amount_untaxed': voucher_untax_amount, 'tax_amount':0.0})
                 continue
 
             tax = [tax_pool.browse(cr, uid, voucher.tax_id.id, context=context)]
             partner = partner_pool.browse(cr, uid, voucher.partner_id.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)
-
-            total = voucher_amount
             total_tax = 0.0
-
+            total = 0.0
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_untax_amount, 1).get('taxes', []):
                     total_tax += tax_line.get('amount', 0.0)
-                total += total_tax
             else:
                 for line in voucher.line_ids:
                     line_total = 0.0
@@ -383,8 +400,8 @@ class account_voucher(osv.osv):
                     total_tax += line_tax
                     untax_amount = line.untax_amount or line.amount
                     voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
-
-            self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
+            total = total_tax+voucher_untax_amount
+            self.write(cr, uid, [voucher.id], {'amount': total, 'amount_untaxed': voucher_untax_amount, 'tax_amount':total_tax})
         return True
 
     def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
@@ -396,17 +413,19 @@ class account_voucher(osv.osv):
         res = {
             'tax_amount': False,
             'amount': False,
+            'amount_untaxed': False,
         }
         voucher_total = 0.0
-
+        amount_untaxed = 0.0 
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
-
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
             voucher_total += line_amount
-        total = voucher_total
+       
+        amount_untaxed = voucher_total
         total_tax = 0.0
+        total = 0.0
         if tax_id:
             tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
             if partner_id:
@@ -415,13 +434,13 @@ 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,  amount_untaxed, 1).get('taxes', []):
                     total_tax += tax_line.get('amount')
-                total += total_tax
-
+        total = total_tax + amount_untaxed
         res.update({
-            'amount':total or voucher_total,
-            'tax_amount':total_tax    
+            'amount_untaxed': amount_untaxed,
+            'amount': total,
+            'tax_amount':total_tax 
         })
         return {
             'value':res
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 907f6d47283..a924028ade5 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -94,6 +94,7 @@
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
                                    <group>
+                                   <field name="amount_untaxed"/>
                                      <field name="tax_amount"/>
                                      <field name="amount" class="oe_subtotal_footer_separator"/>
                                    </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7e0721d6b3d..956fea346d9 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -129,17 +129,19 @@
                             <button type="object"
                                    icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                     attrs="{'invisible': [('state','!=','draft')]}"/>
+                               <field name="tax_id"
+                                on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                widget="selection"
+                               domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                    
                             <group>
                                 <group>
-                                      <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                      <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                    <field name="tax_id" string="Tax"
-                                        on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                        widget="selection"
-                                       domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                    <field name="tax_amount"/>
-                                    <field name="amount" class="oe_subtotal_footer_separator" />
+                                   <field name="amount_untaxed"/>
+                                    <field name="tax_amount" readonly="1"/>
+                                    <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
                                 </group>
                             </group>
                         </page>
@@ -279,10 +281,10 @@
                                         widget="selection"
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
-                                    <field name="tax_amount" />
-                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
-                                </group>                                    
-
+                                    <field name="amount_untaxed" readonly="1"/>
+                                    <field name="tax_amount" readonly="1"/>
+                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

From 4a40e6779ac32b9709b87a1046269be636ec6105 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 12:54:02 +0530
Subject: [PATCH 147/397] [IMP]: Improve view

bzr revid: atp@tinyerp.com-20120629072402-fnzj2y4le7leeqe7
---
 addons/account_voucher/account_voucher.py     |  2 +-
 .../account_voucher/account_voucher_view.xml  |  8 ++--
 .../voucher_payment_receipt_view.xml          |  6 ++-
 .../voucher_sales_purchase_view.xml           | 41 +++++++++++--------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6545990ba3a..10da37dd88a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -332,7 +332,7 @@ class account_voucher(osv.osv):
         'amount_untaxed': fields.function(_amount_untaxed, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.voucher': (lambda self, cr, uid, ids, c={}: ids, ['line_ids'], 20),
-                'account.voucher.line': (_get_voucher_line, ['amount', 'untax_amount '], 20),
+                'account.voucher.line': (_get_voucher_line, ['account_id', 'voucher_id', 'amount', 'untax_amount '], 20),
             },
             multi='all'),
     }
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a924028ade5..9d61084ebfd 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -89,14 +89,14 @@
                              <group>
                                 <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
                              </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer  oe_right">
+                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer">
                                    <group>
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
                                    <group>
-                                   <field name="amount_untaxed"/>
-                                     <field name="tax_amount"/>
-                                     <field name="amount" class="oe_subtotal_footer_separator"/>
+                                   <field name="amount_untaxed" readonly="1"/>
+                                     <field name="tax_amount" readonly="1"/>
+                                     <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
                                    </group>
                               </group>
                               <group>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 7c9ba177e70..74dbf939732 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -393,7 +393,10 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <group>
+                            <group col="3">
+                               <group>
+                                   <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
+                               </group>
                                 <group string="Currency Options" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
@@ -412,7 +415,6 @@
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
                             </group>
-                            <field name="narration"  nolabel="1"  placeholder="Add an internal note"/>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="4">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 956fea346d9..2dbc59d63cc 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -126,23 +126,28 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <button type="object"
-                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                    attrs="{'invisible': [('state','!=','draft')]}"/>
-                               <field name="tax_id"
-                                on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                widget="selection"
-                               domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                    
                             <group>
                                 <group>
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                   <field name="amount_untaxed"/>
-                                    <field name="tax_amount" readonly="1"/>
-                                    <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                  <group>
+                                     <field name="tax_id"
+                                      on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                      widget="selection"
+                                      domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                  </group>
+                                  <group>
+                                       <field name="amount_untaxed"/>
+                                       <field name="tax_amount" readonly="1"/>
+                                       <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
                                 </group>
+                               <group>
+                                 <button type="object"
+                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                    attrs="{'invisible': [('state','!=','draft')]}"/>
+                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -273,17 +278,21 @@
                             </field>
                             <group>
                                 <group>
-                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
+                                    <field name="narration" placeholder="Internal Notes" colspan="2" nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer">
-                                    <field name="tax_id" 
+                                   <group>
+                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection"
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
-                                    <field name="amount_untaxed" readonly="1"/>
-                                    <field name="tax_amount" readonly="1"/>
-                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                   </group>
+                                    <group>
+                                       <field name="amount_untaxed" readonly="1"/>
+                                       <field name="tax_amount" readonly="1"/>
+                                       <field name="amount" string="Total" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
                                 </group>
                             </group>
                         </page>

From 1799ba4fc1748aa52ccc499b6c2a9d1d0254d1e4 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 17:05:06 +0530
Subject: [PATCH 148/397] [IMP]res-partner-view

bzr revid: pna@tinyerp.com-20120629113506-1tsfiy2a8r3ims5l
---
 openerp/addons/base/res/res_partner_view.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index aaab3a7d008..b58e4075061 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -237,7 +237,13 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="History" invisible="True"></page>
+                        <page string="History" invisible="True">
+                            <group string="Tasks" invisible="True"></group> 
+                            <group string="Claim" invisible="True"></group>
+                            <group string="Event" invisible="True"></group>
+                            <group string="Registration" invisible="True"></group>
+                            <group string="Campaign" invisible="True"></group>
+                        </page>
                         <page string="Internal Notes">
                             <field name="comment" placeholder="Internal notes about this customer..."/>
                         </page>

From c09112510f243851200f7e4f5b8dd5e09d6a19ba Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 17:09:33 +0530
Subject: [PATCH 149/397] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629113933-ei3t7z6u0fx3e5h4
---
 addons/crm_claim/crm_claim_view.xml            |  5 ++++-
 addons/event/res_partner_view.xml              | 12 ++++++++++--
 addons/marketing_campaign/res_partner_view.xml |  7 +++++--
 addons/project/res_partner_view.xml            |  7 +++++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a080dd71c52..35c5e300bc5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -257,6 +257,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Claim']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
         </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
@@ -267,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='History']" position="inside">
+                    <xpath expr="//group[@string='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 410030408c7..6a3db28d486 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,12 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//group[@string='Event']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//group[@string='Registration']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
             </field>
        </record>
        <record id="view_event_partner_info_form" model="ir.ui.view">
@@ -21,13 +27,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                <group string="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
                             <field name="main_speaker_id"/>
                         </tree>
                     </field>
+                   </group>
+                   <group string="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
@@ -39,7 +47,7 @@
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                         </tree>
                     </field>
-                </page>
+               </group>
             </field>
        </record>
 
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b5fb2a31f1a..a424ad03a5f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Campaign']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
            </field>
           </record>	
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
@@ -20,9 +23,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <page string="History" position="inside">
+                    <group string="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
-                        </page>
+                    </group>
             </field>
        </record>
    </data>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 2a648791056..2fd15bbf8d1 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -12,6 +12,9 @@
                 <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <xpath expr="//group[@string='Tasks']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
              </field>
           </record>	
         <record id="view_task_partner_info_form" model="ir.ui.view">
@@ -20,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="inside">
+                   <group string="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>
@@ -31,7 +34,7 @@
 			    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
-                </page>
+                  </group>
             </field>
        </record>
        

From 7828a1002af4acf1371ee6f56c4b94dadf1b4c41 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 17:20:04 +0530
Subject: [PATCH 150/397] [IMP]: ADD oe_right in oe_subtotal_footer group.

bzr revid: atp@tinyerp.com-20120629115004-26a3q4t3bwsrc3em
---
 addons/account_voucher/account_voucher_view.xml        | 2 +-
 addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 9d61084ebfd..5245b3525cd 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -89,7 +89,7 @@
                              <group>
                                 <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
                              </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer">
+                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
                                    <group>
                                      <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
                                    </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 2dbc59d63cc..ea811b1d02a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -130,7 +130,7 @@
                                 <group>
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
-                                <group class="oe_subtotal_footer">
+                                <group class="oe_subtotal_footer oe_right">
                                   <group>
                                      <field name="tax_id"
                                       on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
@@ -280,7 +280,7 @@
                                 <group>
                                     <field name="narration" placeholder="Internal Notes" colspan="2" nolabel="1" />
                                 </group>
-                                <group class="oe_subtotal_footer">
+                                <group class="oe_subtotal_footer oe_right">
                                    <group>
                                      <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"

From 297699f4d2d8e1f2d80a5b55c404414537d0c481 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 29 Jun 2012 17:22:26 +0530
Subject: [PATCH 151/397] [REM]: Remove account_invoice_layout module

bzr revid: atp@tinyerp.com-20120629115226-xhiwxn7m8507evdi
---
 .../account_invoice_layout.py.THIS            | 210 ------------------
 .../account_invoice_layout_view.xml.THIS      | 123 ----------
 2 files changed, 333 deletions(-)
 delete mode 100644 addons/account_invoice_layout/account_invoice_layout.py.THIS
 delete mode 100644 addons/account_invoice_layout/account_invoice_layout_view.xml.THIS

diff --git a/addons/account_invoice_layout/account_invoice_layout.py.THIS b/addons/account_invoice_layout/account_invoice_layout.py.THIS
deleted file mode 100644
index 1336914fb35..00000000000
--- a/addons/account_invoice_layout/account_invoice_layout.py.THIS
+++ /dev/null
@@ -1,210 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 osv import fields, osv
-
-class notify_message(osv.osv):
-    _name = 'notify.message'
-    _description = 'Notify By Messages'
-    _columns = {
-        'name':  fields.char('Title', size=64, required=True),
-        'msg': fields.text('Special Message', size=128, required=True, help='This notification will appear at the bottom of the Invoices when printed.', translate=True)
-    }
-
-notify_message()
-
-class account_invoice_line(osv.osv):
-
-    def move_line_get_item(self, cr, uid, line, context=None):
-        if line.state != 'article':
-            return None
-        return super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        article = {
-            'article': [('readonly', False), ('invisible', False)],
-            'text': [('readonly', True), ('invisible', True), ('required', False)],
-            'subtotal': [('readonly', True), ('invisible', True), ('required', False)],
-            'title': [('readonly', True), ('invisible', True), ('required', False)],
-            'break': [('readonly', True), ('invisible', True), ('required', False)],
-            'line': [('readonly', True), ('invisible', True), ('required', False)],
-        }
-        states = {
-            'name': {
-                'break': [('readonly', True),('required', False),('invisible', True)],
-                'line': [('readonly', True),('required', False),('invisible', True)],
-                },
-            'product_id': article,
-            'account_id': article,
-            'quantity': article,
-            'uos_id': article,
-            'price_unit': article,
-            'discount': article,
-            'invoice_line_tax_id': article,
-            'account_analytic_id': article,
-        }
-        res = super(account_invoice_line, self).fields_get(cr, uid, fields, context)
-        for field in res:
-            if states.has_key(field):
-                for key,value in states[field].items():
-                    res[field].setdefault('states',{})
-                    res[field]['states'][key] = value
-        return res
-
-    def onchange_invoice_line_view(self, cr, uid, id, type, context=None, *args):
-
-        if (not type):
-            return {}
-        if type != 'article':
-            temp = {'value': {
-                    'product_id': False,
-                    'uos_id': False,
-                    'account_id': False,
-                    'price_unit': False,
-                    'price_subtotal': False,
-                    'quantity': 0,
-                    'discount': False,
-                    'invoice_line_tax_id': False,
-                    'account_analytic_id': False,
-                    },
-                }
-            if type == 'line':
-                temp['value']['name'] = ' '
-            if type == 'break':
-                temp['value']['name'] = ' '
-            if type == 'subtotal':
-                temp['value']['name'] = 'Sub Total'
-            return temp
-        return {}
-
-    def create(self, cr, user, vals, context=None):
-        if vals.has_key('state'):
-            if vals['state'] == 'line':
-                vals['name'] = ' '
-            if vals['state'] == 'break':
-                vals['name'] = ' '
-            if vals['state'] != 'article':
-                vals['quantity']= 0
-                vals['account_id']= self._default_account(cr, user, None)
-        return super(account_invoice_line, self).create(cr, user, vals, context)
-
-    def write(self, cr, user, ids, vals, context=None):
-        if vals.has_key('state'):
-            if vals['state'] != 'article':
-                vals['product_id']= False
-                vals['uos_id']= False
-                vals['account_id']= self._default_account(cr, user, None)
-                vals['price_unit']= False
-                vals['price_subtotal']= False
-                vals['quantity']= 0
-                vals['discount']= False
-                vals['invoice_line_tax_id']= False
-                vals['account_analytic_id']= False
-            if vals['state'] == 'line':
-                vals['name'] = ' '
-            if vals['state'] == 'break':
-                vals['name'] = ' '
-        return super(account_invoice_line, self).write(cr, user, ids, vals, context)
-
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default['state'] = self.browse(cr, uid, id, context=context).state
-        return super(account_invoice_line, self).copy_data(cr, uid, id, default, context)
-
-    def _fnct(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        lines = self.browse(cr, uid, ids, context=context)
-        account_ids = [line.account_id.id for line in lines]
-        account_names = dict(self.pool.get('account.account').name_get(cr, uid, account_ids, context=context))
-        for line in lines:
-            if line.state != 'article':
-                if line.state == 'line':
-                    res[line.id] = '-----------------------------------------'
-                elif line.state == 'break':
-                    res[line.id] = 'PAGE BREAK'
-                else:
-                    res[line.id] = ' '
-            else:
-                res[line.id] = account_names.get(line.account_id.id, '')
-        return res
-
-    _name = "account.invoice.line"
-    _order = "invoice_id, sequence asc"
-    _description = "Invoice Line"
-    _inherit = "account.invoice.line"
-    _columns = {
-        'state': fields.selection([
-                ('article','Product'),
-                ('title','Title'),
-                ('text','Note'),
-                ('subtotal','Sub Total'),
-                ('line','Separator Line'),
-                ('break','Page Break'),]
-            ,'Type', select=True, required=True),
-        'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
-        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
-    }
-
-    def _default_account(self, cr, uid, context=None):
-        cr.execute("select id from account_account where parent_id IS NULL LIMIT 1")
-        res = cr.fetchone()
-        return res[0]
-
-    _defaults = {
-        'state': 'article',
-        'sequence': 0,
-    }
-
-account_invoice_line()
-
-class one2many_mod2(fields.one2many):
-
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-        if not values:
-            values = {}
-        res = {}
-        for id in ids:
-            res[id] = []
-        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('state','=','article')], limit=self._limit)
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-            res[r[self._fields_id]].append( r['id'] )
-        return res
-
-class account_invoice(osv.osv):
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default['invoice_line'] = False
-        return super(account_invoice, self).copy(cr, uid, id, default, context)
-
-    _inherit = "account.invoice"
-    _columns = {
-        'abstract_line_ids': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
-        'invoice_line': one2many_mod2('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
-    }
-
-account_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS b/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS
deleted file mode 100644
index faaed1dfd79..00000000000
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml.THIS
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
-            <field name="name">account.invoice.line.form.inherit_1</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="account.view_invoice_line_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="product_id" position="before">
-                    <field name="state" on_change="onchange_invoice_line_view(state)" />
-                </field>
-                <field name="account_id" position="before">
-                    <field name="sequence"/>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
-            <field name="name">account.invoice.line.tree.inherit_1</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='name']" position="before">
-                    <field name="state" invisible="1"/>
-                    <field name="sequence" string="Seq."/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
-            <field name="name">account.invoice.line.tree.inherit_2</field>
-            <field name="model">account.invoice.line</field>
-            <field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='account_id']" position="replace">
-                    <field name="functional_field"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="account_invoice_form_inherit_1">
-            <field name="name">account.invoice.form.inherit_1</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='invoice_line']" position="replace">
-                    <!-- keep the original fields, because other views position on that, too -->
-                    <field name="invoice_line" invisible="True"/>
-                    <field name="abstract_line_ids" colspan="4" nolabel="1"/>
-                </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="account_invoice_supplier_form_layout">
-          <field name="name">account.invoice.supplier.form.layout</field>
-          <field name="model">account.invoice</field>
-          <field name="inherit_id" ref="account.invoice_supplier_form"/>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-            <xpath expr="//field[@name='invoice_line']/tree/*[1]" position="before">
-              <field name="state" invisible="1"/>
-            </xpath>
-          </field>
-        </record>
-
-<!-- notification message views -->
-    <record model="ir.ui.view" id="view_notify_message_search">
-        <field name="name">notify.message.search</field>
-        <field name="model">notify.message</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Messages">
-                <field name="name" string="Message"/>
-                <separator orientation="vertical"/>
-                <field name="msg"/>
-            </search>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_notify_message_tree">
-        <field name="name">notify.message.tree</field>
-        <field name="model">notify.message</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Messages">
-                <field name="name"/>
-                <field name="msg"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_notify_message_form">
-        <field name="name">notify.message.form</field>
-        <field name="model">notify.message</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Messages" version="7.0">
-                <group string="Write a notification or a wishful message.">
-                    <field name="name"/>
-                </group>
-                <group string="Special Message">
-                    <field name="msg"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="notify_mesage_tree_form">
-        <field name="name">Write Messages</field>
-        <field name="res_model">notify.message</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_notify_message_search"/>
-    </record>
-
-    <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration" sequence="45"/>
-    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
-
-    </data>
-</openerp>

From c965934484ba6824b81cb5d4cd5aa0fcca88b9b7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 29 Jun 2012 17:51:53 +0530
Subject: [PATCH 152/397] [IMP] imporve the view of outlook and thunderbird
 plugins.

bzr revid: nco@tinyerp.com-20120629122153-hzkibz5gx02f8nff
---
 addons/plugin_outlook/plugin_outlook.xml         | 14 +++-----------
 addons/plugin_thunderbird/plugin_thunderbird.xml | 13 +++----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 13c1e6f32c4..c1fe66b3354 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -11,14 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
-                    <separator string="title" position="before">
-                        <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace">
-                    </xpath>
+                    <xpath expr="//button[@string='Install Modules']" position="replace"/>
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
@@ -32,9 +26,7 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                        <attribute name="string">Install Outlook Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 7ff4f529fd0..4c8f90d3d1d 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,13 +11,8 @@
                     <form position="attributes">
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
-                     <separator string="title" position="before">
-                        <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
-                    </separator>
-                    <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </xpath>
-                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
+                  	<xpath expr="//button[@string='Install Modules']" position="replace"/> 
+                    <xpath expr="//button[@string='Cancel']" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>
@@ -37,9 +32,7 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator string="title" position="attributes">
-                         <attribute name="string">Install Thunderbird Plug-In</attribute>
-                    </separator>
+                    <separator position="replace"/>
                 </data>
             </field>
         </record>

From 4ef750426e011f5daf3dc4c268260acccc348605 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 29 Jun 2012 18:19:37 +0530
Subject: [PATCH 153/397] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120629124937-csslsnhmqlm4woa5
---
 addons/event/res_partner_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 6a3db28d486..478ffd0fb2e 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,6 +13,9 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+                <xpath expr="//page[@string='History']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
                 <xpath expr="//group[@string='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>

From 66c7c07a83df000cf0d314a035855fb1ddb76aa0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 10:21:47 +0530
Subject: [PATCH 154/397] [IMP]: Improve view.change separator string.

bzr revid: atp@tinyerp.com-20120702045147-zes3zfsjllegrykz
---
 addons/plugin_outlook/plugin_outlook.xml         | 4 +++-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index c1fe66b3354..b8a9129cad2 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -26,7 +26,9 @@
                             <li>2. MS .Net Framework 3.5 or above.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 4c8f90d3d1d..8cfff8a18d4 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -32,7 +32,10 @@
                             <li>7. Configure your openerp server.</li>
                         </ul>
                     </xpath>
-                    <separator position="replace"/>
+                    <separator string="title" position="attributes">
+                        <attribute name="string"></attribute>
+                      </separator>
+
                 </data>
             </field>
         </record>

From 548f2475316c16852bd01afcd398e00e9fb14e69 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 2 Jul 2012 11:14:33 +0530
Subject: [PATCH 155/397] [IMP] res-partner-view

bzr revid: pna@tinyerp.com-20120702054433-6kx399wosnidbm0p
---
 addons/marketing_campaign/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index a424ad03a5f..1ee2e349472 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,8 +3,8 @@
     <data>
 
          <!--  Partners inherited form -->
-        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit1</field>
+        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
+           <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>

From 6f8990949664280f5b44cda5cb6b15a857d352c6 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 2 Jul 2012 18:55:40 +0530
Subject: [PATCH 156/397] [IMP] improve payment order

bzr revid: shp@tinyerp.com-20120702132540-p29np5fsy0hzdtvp
---
 addons/account/account_view.xml                   | 15 ++++++++++-----
 addons/account_asset/account_asset.py             |  2 +-
 .../wizard/account_followup_print_view.xml        |  1 -
 addons/account_payment/account_payment.py         |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8b294690a79..d2568fe1717 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -108,11 +108,6 @@
                         <group>
                             <field name="name"/>
                             <field name="fiscalyear_id" widget="selection"/>
-                            <label for="date_start" string="Duration"/>
-                            <div>
-                                <field name="date_start"/> - 
-                                <field name="date_stop" nolabel="1"/>
-                            </div>
                         </group>
                         <group>
                             <field name="code"/>
@@ -120,6 +115,16 @@
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                     </group>
+					<group>
+                          <group>
+                            <label for="date_start" string="Duration" />
+                            <div>
+                               <field name="date_start" class="oe_inline" nolabel="1"/> 
+                                <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+                                <field name="date_stop" nolabel="1" class="oe_inline"/>
+                             </div>
+                            </group>
+					</group>
                 </sheet>
                 </form>
             </field>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 32019ed31fe..e491b858286 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -345,7 +345,7 @@ class account_asset_depreciation_line(osv.osv):
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
         'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount To Depreciate', required=True),
+        'remaining_value': fields.float('Amount to Depreciate', required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
         'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 01bfcf62e79..f3701c34200 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,6 @@
                     <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 </header>
-                <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 02d12a534db..22b7fc5f6f2 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -98,7 +98,7 @@ class payment_order(osv.osv):
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),
-        'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
             ('due', 'Due date'),

From 7f6a3c4336023e09618bcde5d48c4f8f7d025ae5 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 21:25:41 +0530
Subject: [PATCH 157/397] [IMP]: Improve view.

bzr revid: atp@tinyerp.com-20120702155541-r4wgdwz972waimr3
---
 addons/account/account_invoice_view.xml            |  3 +--
 addons/account_budget/account_budget_view.xml      | 14 ++++++++------
 addons/account_coda/account_coda_wizard.xml        |  2 +-
 .../voucher_sales_purchase_view.xml                |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8368bee4dff..46d3412f3b2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -379,9 +379,8 @@
                               <field name="move_id" groups="account.group_account_user"/>
                              </group>
                              <group>
-                            	<field name="origin" placeholder="SO0032"/>
+                                <field name="origin" placeholder="SO0032"/>
                                 <field name="date_due"/>
-                                <field name="user_id" groups="base.group_user"/>
                                 <newline/>
                                 <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
                              </group>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 23f6777d7df..86e7cf3219d 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,7 +117,7 @@
                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
-                        <group>
+                        <group col="4">
                             <group>
                                 <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -127,11 +127,12 @@
                                 <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <label for="date_from" string="Duration"/>
                                 <div>
-                                    <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> - 
-                                    <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
+                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span> 
+                                    <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
                                 </div>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            </group>
+                          </group>
                         </group>
                         <notebook>
                             <page string="Budget Lines">
@@ -148,14 +149,15 @@
                                         <field name="percentage"/>
                                     </tree>
                                     <form string="Budget Lines" version="7.0">
-                                        <group>
+                                        <group col="4">
                                             <group>
                                                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                                 <field name="general_budget_id"/>
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from"/>-
+                                                    <field name="date_from"/>
+                                                     <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
                                                     <field name="date_to"/>
                                                 </div>
                                             </group>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 7bb5d9eb66b..655f1afb95e 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -14,7 +14,7 @@
                 or
                 <button string="Cancel" class="oe_link" special="cancel"/>
             </header>
-            <group col="2" string="Select Your File :">
+            <group col="2">
                 <field name="coda_data" filename="coda_fname"/>
                 <field name="coda_fname"/>
             </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index c133051c656..1c2fb977ea6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -144,9 +144,9 @@
                                     </group>
                                 </group>
                                <group>
-                                 <button type="object"
-                                   icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                    attrs="{'invisible': [('state','!=','draft')]}"/>
+                                  <button type="object"
+                                        icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                         attrs="{'invisible': [('state','!=','draft')]}"/>
                                </group>
                             </group>
                         </page>

From bd440a9e053ed311b95c51e56dc2e855c9d2a734 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 22:40:14 +0530
Subject: [PATCH 158/397] [FIX]: Change user name in cash register~

bzr revid: atp@tinyerp.com-20120702171014-pj2irjfmr7q74gys
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index fb12f27b405..1893efb3c27 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2574,7 +2574,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     </h2>
                     <group col="4">
                       <group>
-                         <field name="user_id" readonly="1"/>
+                         <field name="user_id" readonly="1" string="Responsible"/>
                          <field name="total_entry_encoding"/>
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />     
                        </group>

From fa3100073a178c7ef8cab7e1c478b7c52dbf20ee Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Jul 2012 22:50:54 +0530
Subject: [PATCH 159/397] [IMP]: Improve account bank statement view

bzr revid: atp@tinyerp.com-20120702172054-jxhisxzazi57c1nw
---
 addons/account/account_view.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1893efb3c27..b24ffa9bc0f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -609,17 +609,15 @@
                    <div class="oe_right oe_button_box" name="import_buttons">
                        <!-- Put here related buttons -->
                     </div>
-                    <div class="oe_title">
-                       <label for="name" class="oe_edit_only"/>
-                       <h1>
-                         <field name="name" class="oe_inline"/>-
-                         <field name="period_id" class="oe_inline"/>
-                       </h1>
-                       <label for="journal_id" class="oe_edit_only"/>
-                       <h2>
-                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
-                       </h2>
-                    </div>
+                     <label for="name" class="oe_edit_only"/>
+                     <h1>
+                       <field name="name" class="oe_inline"/>-
+                       <field name="period_id" class="oe_inline"/>
+                     </h1>
+                     <label for="journal_id" class="oe_edit_only"/>
+                     <h2>
+                       <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
+                     </h2>
                     <group>
                         <group>
                             <field name="date" on_change="onchange_date(date, company_id)"/>

From 2649dd52c9a10a05ee1fd4f84367f61a1ce7a9e1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Jul 2012 14:28:26 +0530
Subject: [PATCH 160/397] [IMP]:mrp:improved Manufacturing Order view with h1
 and h2

bzr revid: apa@tinyerp.com-20120704085826-abq2adz03n0xt8to
---
 addons/mrp/mrp_view.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 06f63462261..e72ae082fcf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -637,17 +637,20 @@
                     <label for="product_id" class="oe_edit_only"/>
                     <h1>
                         <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+" class="oe_inline"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" />
                     </h1>
-                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_edit_only"/>
+                    <label for="product_qty" class="oe_edit_only"/>
                     <h2>
-                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                        <field name="product_qty" class="oe_inline"/>
+                        <label/>
+                        <field name="product_uom" class="oe_inline"/>
+                        <label/>
+                        <button type="action"
+                            icon="terp-accessories-archiver+"
+                            name="%(mrp.action_change_production_qty)d"
+                            string="Change Qty" states="ready,confirmed" class="oe_inline"/>
                     </h2>
+                    <label for="routing_id" class="oe_edit_only" groups="mrp.group_mrp_routings"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <group>
                         <group>
                             <field name="name"/>

From 4851d7479b32c428750e76b814a7821be688515e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 14:48:06 +0530
Subject: [PATCH 161/397] [IMP]res_user: remove group string

bzr revid: kjo@tinyerp.com-20120704091806-0ie4yp41hvkcn23b
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 38d7526d6aa..7997e476b02 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -202,7 +202,7 @@
                             <field name="name" readonly="1" class="oe_inline oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_inline oe_edit_only"/>)
                     </h1>
-                    <group col="4" string="Preferences">
+                    <group col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From b68d283a17bff0fa098984dd903403dbfce8ab27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 11:45:47 +0200
Subject: [PATCH 162/397] [FIX] res_users in mail: fixed override of chatter
 get_domain; fixed view; res_partner: fixed an indentation issue.

bzr revid: tde@openerp.com-20120704094547-cll23akw4euq0yih
---
 addons/mail/res_partner_view.xml | 2 +-
 addons/mail/res_users.py         | 4 ++--
 addons/mail/res_users_view.xml   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 15f6618c8e5..0c7aca1a30d 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <footer>
-                    <field name="message_ids" widget="mail_thread" 
+                        <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </footer>
                 </xpath>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 7cbbb123bcb..5135fd31e35 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -73,10 +73,10 @@ class res_users(osv.osv):
             The purpose is to add messages directly sent to user using
             @user_login.
         """
-        initial_domain = super(res_partner, self).message_search_get_domain(cr, uid, ids, context=context)
+        initial_domain = super(res_users, self).message_search_get_domain(cr, uid, ids, context=context)
         custom_domain = []
         for user in self.browse(cr, uid, ids, context=context):
             if custom_domain:
                 custom_domain += ['|']
             custom_domain += ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
-        return ['|'] + search_domain + custom_domain
+        return ['|'] + initial_domain + custom_domain
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 918f77e0ace..7e439bb3de8 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,9 +27,9 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_bottom">
+                    <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </div>
+                    </footer>
                 </xpath>
             </data>
             </field>

From 3f25216ed8a3f0ba7d45685af743ba9142f1f10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 14:10:12 +0200
Subject: [PATCH 163/397] [IMP] Mail-Chatter: cleaned xml templates.

bzr revid: tde@openerp.com-20120704121012-x6koqqmz6v6ew7h0
---
 addons/mail/static/src/xml/mail.xml | 46 ++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 71d7a428264..167d6a86f00 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -25,9 +25,8 @@
         </table>
         <div class="oe_mail_wall_main">
             <div class="oe_mail_wall_action">
-                <img class="oe_mail_msg_image oe_left" alt="User img"/>
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
-                <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
+                <!-- call the composition form -->
+                <t t-call ="mail.compose_message"/>
             </div>
             <div class="oe_clear"/>
             <ul class="oe_mail_wall_threads">
@@ -51,7 +50,7 @@
 
     <!--
         record_thread main template
-        Template used to display the communciation history in documents
+        Template used to display the communication history in documents
         form view.
         -->
     <div t-name="mail.record_thread" class="oe_mail_recthread">
@@ -73,32 +72,43 @@
     </div>
 
     <!--
-        record_thread.record_thread template
-        Template used to display subscibers
+        record_thread.subscriber template
+        Template used to display a subscriber.
         -->
     <li t-name="mail.record_thread.subscriber">
-        <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
-        <a href="#" class="oe_mail_oe_internal_link" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
     </li>
 
     <!--
-        compose_message template
+        mail.compose_message template
         This template holds the composition form to write a note or send
-        an e-mail.
+        an e-mail. It contains by default a textarea, that will be replaced
+        by another composition form in the main wall composition form, or
+        for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
         <div>
-            <img class="oe_mail_msg_image oe_left" alt="User img"/>
+            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <!-- contains the composition form -->
+                <!-- default content: old basic textarea -->
+                <textarea class="oe_mail_compose_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
             </div>
             <div class="oe_clear"/>
         </div>
     </t>
 
+    <!--
+        thread template
+        This template holds a thread of comments. It begins with an actions
+        container, holding the composition form. Then come the various
+        messages. Then comes the 'more' button.
+        -->
     <ul t-name="mail.thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
-            <!-- contains the composition form -->
+        <div class="oe_mail_thread_action">
+            <!-- contains the composition box (form + image) -->
+            <t t-call="mail.compose_message"/>
         </div>
         <div class="oe_mail_thread_display">
             <!-- contains the threads -->
@@ -109,10 +119,11 @@
     </ul>
 
     <!-- default layout -->
-    <div t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
+    <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_email_icon oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
+                <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="display['show_delete']">
@@ -131,8 +142,9 @@
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
+                <!-- message itself -->
                 <div class="oe_mail_msg">
-                    <h1 t-if="record.subject &amp;&amp; record.subject != 'Reply'" class="oe_mail_msg_title">
+                    <h1 t-if="record.subject" class="oe_mail_msg_title">
                         <t t-raw="record.subject"/>
                     </h1>
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
@@ -166,6 +178,6 @@
                 </div>
             </div>
         </div>
-    </div>
+    </li>
 
 </template>

From 724964df55d17189681c29927afd509888191160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 14:10:39 +0200
Subject: [PATCH 164/397] [IMP] Mail-Chatter: cleaned css definition for
 chatter.

bzr revid: tde@openerp.com-20120704121039-60uj77490gu02ltg
---
 addons/mail/static/src/css/mail.css           | 163 ++++++++----------
 .../static/src/css/mail_compose_message.css   |   6 -
 2 files changed, 76 insertions(+), 93 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e7ae016289e..3c5842dd7c1 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,7 +1,6 @@
-
-/* ------------------------------ */
-/* Wall                           */
-/* ------------------------------ */
+/* ------------------------------------------------------------ */
+/* Wall
+/* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_wall {
     overflow: auto;
@@ -32,24 +31,32 @@
     clear: both; 
 }
 
-.openerp .oe_mail_wall_action textarea {
+.openerp div.oe_mail_wall_action .oe_mail_msg_content {
+    width: 484px;
+}
+
+.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
     margin-bottom: 8px;
-    float: right;
+    /*float: right;*/
 }
 
-/* Threads */
-.openerp .oe_mail_wall_threads {
+.openerp ul.oe_mail_wall_threads {
     margin-top: 8px;
 }
-.openerp .oe_mail_wall_threads textarea {
-    height: 40px;
+
+/* Specific display of threads in the wall */
+/* ------------------------------------------------------------ */
+
+.openerp ul.oe_mail_wall_threads textarea {
+    width: 434px;
+    height: 30px;
     padding: 4px;
 }
 
-.openerp .oe_mail_wall_thread:first .oe_mail_msg_notification {
+.openerp li.oe_mail_wall_thread:first .oe_mail_msg_notification {
     border-top: 0;
 }
 
@@ -63,7 +70,7 @@
     width: 486px;
 }
 
-.openerp div.oe_mail_msg_content li{
+.openerp div.oe_mail_msg_content li {
     float: left;
     margin-right: 3px;
 }
@@ -78,9 +85,9 @@
 }
 
 
-/* ------------------------------ */
-/* RecordThread                   */
-/* ------------------------------ */
+/* ------------------------------------------------------------ */
+/* RecordThread
+/* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_recthread {
     overflow: auto;
@@ -96,21 +103,10 @@
     width: 250px;
 }
 
-/* Left-side CSS */
 .openerp div.oe_mail_recthread_actions {
     margin-bottom: 8px;
 }
 
-.openerp div.oe_mail_recthread_followers {
-    margin-bottom: 8px;
-}
-
-.openerp div.oe_mail_recthread_followers img.oe_mail_msg_image {
-    width: 28px;
-    height: 28px;
-    margin: 4px;
-}
-
 .openerp div.oe_mail_recthread_actions button {
     width: 120px;
 }
@@ -142,21 +138,17 @@
   background-image: linear-gradient(to bottom, #dc5f59, #b33630);
 }
 
-.openerp textarea.oe_mail_action_textarea {
-    height: 60px;
-    padding: 5px;
+.openerp div.oe_mail_recthread_followers {
+    margin-bottom: 8px;
 }
 
-.openerp .oe_mail_compose img{
-    max-height: 25px;
-}
 
-/* ------------------------------ */
-/* ThreadDisplay                  */
-/* ------------------------------ */
+/* ------------------------------------------------------------ */
+/* Thread
+/* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_thread_action {
-	display: none;
+	/*display: none;*/
     white-space: normal;
     padding: 8px;
     background: #eee;
@@ -169,6 +161,23 @@
     clear: both; 
 }
 
+/* TODO */
+.openerp textarea.oe_mail_compose_textarea {
+    width: 474px;
+    height: 60px;
+    padding: 4px;
+    font-size: 12px;
+    border: 1px solid #cccccc;
+}
+
+.openerp textarea.oe_mail_compose_textarea:focus {
+    outline: 0;
+    border-color: rgba(82, 168, 236, 0.8);
+    -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+    -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+    -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
 .openerp div.oe_mail_thread_display {
     white-space: normal;
 }
@@ -177,32 +186,32 @@
     margin-left: 66px;
 }
 
-.openerp div.oe_mail_thread_subthread .oe_mail_thread_msg:last-child {
+.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child {
     margin-bottom: 8px;
 }
 
-.openerp a.oe_mail_compose {
-	display: none;
-}
-
 .openerp div.oe_mail_thread_more {
     display: none;
     border-bottom: 1px solid #D2D9E7;
 }
 
-/*TODO: LI ?*/
 .openerp li.oe_mail_thread_msg:after {
     content: "";
     display: block;
     clear: both; 
 }
-/*TODO: LI ?*/
+
 .openerp li.oe_mail_thread_msg > div:after {
     content: "";
     display: block;
     clear: both; 
 }
 
+.openerp div.oe_mail_msg {
+    padding: 0;
+    margin: 0 0 4px 0;
+}
+
 .openerp .oe_mail_msg_notification, 
 .openerp .oe_mail_msg_comment, 
 .openerp .oe_mail_msg_email {
@@ -211,11 +220,6 @@
     border-top: 1px solid #ccc;
 }
 
-.openerp .oe_email_icon {
-    width: 50px;
-    height: 50px;
-}
-
 .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
     background: #eee;
 }
@@ -238,9 +242,18 @@
     clear: both; 
 }
 
-.openerp img.oe_mail_msg_image {
+.openerp img.oe_mail_icon {
     width: 50px;
     height: 50px;
+}
+
+.openerp img.oe_mail_thumbnail {
+    width: 28px;
+    height: 28px;
+    margin: 4px;
+}
+
+.openerp img.oe_mail_frame {
     text-align: center;
     overflow: hidden;
     -moz-border-radius: 3px;
@@ -255,48 +268,20 @@
     clip: rect(5px, 40px, 45px, 0px);
 }
 
-/* ------------------------------ */
-/* Styling (should be openerp)    */
-/* ------------------------------ */
 
-.openerp input.oe_mail, textarea.oe_mail {
-    width: 432px;
-    padding: 4px;
-    font-size: 12px;
-    border: 1px solid #cccccc;
-    -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-    -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-    -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-    -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-    transition: border linear 0.2s, box-shadow linear 0.2s;
-    -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-    -box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
+/* ------------------------------------------------------------ */
+/* mail.compose.message form view
+/* ------------------------------------------------------------ */
+
+/* form_view: delete white background */
+.openerp .oe_mail_msg_content .oe_formview {
+    background-color: transparent;
 }
 
-.openerp input.oe_mail:focus, textarea.oe_mail:focus {
-    outline: 0;
-    border-color: rgba(82, 168, 236, 0.8);
-    -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-}
 
-.openerp div.oe_mail_msg {
-    padding: 0;
-    margin: 0 0 4px 0;
-}
-
-.openerp .oe_mail_oe_bold {
-    font-weight: bold;
-}
-
-/* ------------------------------ */
-/* Messages layout                */
-/* ------------------------------ */
+/* ------------------------------------------------------------ */
+/* Messages layout
+/* ------------------------------------------------------------ */
 
 .openerp .oe_mail_msg .oe_mail_msg_title {
     margin: 0;
@@ -326,6 +311,10 @@
     display: inline;
 }
 
+.openerp .oe_mail_oe_bold {
+    font-weight: bold;
+}
+
 /* Read more/less link */
 .openerp .oe_mail_msg_content .expand,
 .openerp .oe_mail_msg_content .reduce {
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 52906075d63..02b056377d3 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -5,9 +5,3 @@
 .openerp tr td .oe_form_field.oe_mail_compose_message_invisible {
     display: none;
 }
-
-/*
-.openerp tr td .oe_form_field.mail_compose_message_subject {
-    display: none;
-}
-*/

From cc54aa0045ed59ce129da4dec4e455479ac7d021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 15:29:28 +0200
Subject: [PATCH 165/397] [IMP] mail.compose.message wizard: cleaned form view
 used in chatter.

bzr revid: tde@openerp.com-20120704132928-0gggibao2h21r78i
---
 addons/mail/wizard/mail_compose_message_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ef78ac2de08..0d74f082f70 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -49,16 +49,14 @@
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_text"/>
-                        <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on ?"
+                        <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
                         <field name="destination_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
-                        <p> or <a href="#" class="mail_compose_message_toggle">Send a Message</a></p>
-                        <button icon="gtk-close" string="Cancel" special="cancel" />
-                        <p>
-                            Checklist . Attach
-                        </p>
+                        <a href="#" class="mail_compose_message_toggle">Extended email</a>
+                        <span>Checklist</span>
+                        <span>Attach</span>
                     </group>
                 </form>
             </field>

From 21264ac8ea943043cfc1acf1a28b389b5d0776a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 15:29:58 +0200
Subject: [PATCH 166/397] [IMP] Chatter: slightly cleaned js code.

bzr revid: tde@openerp.com-20120704132958-gpw8mr9wyvkvcnlt
---
 addons/mail/static/src/js/mail.js | 46 +++++++++----------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 47c36ec838d..ad2bf2bc08d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -249,7 +249,7 @@ openerp.mail = function(session) {
             this.params = params || {};
             this.params.extended_mode = params.extended_mode || false;
             // create a context for the default_get of the compose form
-            var context = {caca: 'prout'};
+            var context = {test: 'test-first'};
             // create a form_view on the mail.compose.message wizard
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
@@ -258,20 +258,19 @@ openerp.mail = function(session) {
                 initial_mode: 'edit',
                 }
             );
-            //debugger;
         },
         
         /**
          * widget start function
-         * - builds and initializes the form view
-         */
+         * - builds and initializes the form view */
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            // get user image
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.session.uid);
-            this.$element.find('img.oe_mail_msg_image').attr('src', user_avatar);
-            // bind events
+            // customize display: add avatar, clean previous content
+            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix,
+                this.session.session_id, 'res.users', 'avatar', this.session.uid);
+            this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
+            this.$element.find('div.oe_mail_msg_content').empty();
             var msg_node = this.$element.find('div.oe_mail_msg_content');
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
@@ -280,7 +279,7 @@ openerp.mail = function(session) {
         },
         
         /**
-         * Bind events in the widget. Each event is slighty described
+         * Bind events in the widget. Each event is slightly described
          * in the function. */
         bind_events: function() {
             var self = this;
@@ -294,22 +293,12 @@ openerp.mail = function(session) {
                 self.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
-                
             });
         },
         
         destroy: function() {
             this._super.apply(this, arguments);
         },
-        
-        do_action: function() {
-            //debugger;
-            var context = arguments[0].context;
-            context.caca = 'prout';
-            this._super.apply(this, arguments);
-            console.log(this);
-            console.log(arguments);
-        },
     }),
 
     /** 
@@ -397,7 +386,9 @@ openerp.mail = function(session) {
             
             // add message composition form view
             this.compose_message = new mail.ComposeMessage(this, {'extended_mode': false, 'uid': this.params.uid});
-            var compose_done = this.compose_message.appendTo(this.$element.find('div.oe_mail_thread_act'));
+            var composition_node = this.$element.find('div.oe_mail_thread_action');
+            composition_node.empty();
+            var compose_done = this.compose_message.appendTo(composition_node);
             
             return display_done && compose_done;
         },
@@ -434,7 +425,7 @@ openerp.mail = function(session) {
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
@@ -446,7 +437,7 @@ openerp.mail = function(session) {
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
@@ -813,7 +804,6 @@ openerp.mail = function(session) {
 
         start: function () {
             this._super.apply(this, arguments);
-            var self = this;
             // add events
             this.add_event_handlers();
             // load mail.message search view
@@ -830,8 +820,6 @@ openerp.mail = function(session) {
         /** Add events */
         add_event_handlers: function () {
             var self = this;
-            // post a comment
-            this.$element.find('.oe_mail_wall_action button').click(function () { return self.do_comment(); });
             // display more threads
             this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
         },
@@ -960,13 +948,5 @@ openerp.mail = function(session) {
             var domain = this.get_fetch_domain();
             return this.fetch_comments(this.params.limit, 0, domain);
         },
-        
-        /** Action: Posts a comment */
-        do_comment: function () {
-            var comment_node = this.$element.find('.oe_mail_wall_action textarea');
-            var body_text = comment_node.val();
-            comment_node.val('');
-            var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html', 'tweet']).then(this.proxy('init_and_fetch_comments'));
-        },
     });
 };

From 8e9a97b940967ea538158d9faf68f578d8df83f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 15:30:09 +0200
Subject: [PATCH 167/397] [IMP] Chatter: improved CSS for embedded form view.

bzr revid: tde@openerp.com-20120704133009-tmkoqreqjt9jhw9b
---
 addons/mail/static/src/css/mail.css | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3c5842dd7c1..5571cb06876 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -274,10 +274,36 @@
 /* ------------------------------------------------------------ */
 
 /* form_view: delete white background */
-.openerp .oe_mail_msg_content .oe_formview {
+.openerp .oe_mail_msg_content div.oe_formview {
     background-color: transparent;
 }
 
+.openerp .oe_mail_msg_content div.oe_form_nosheet {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_group {
+    margin: 0px;
+}
+
+.openerp .oe_mail_msg_content table.oe_form_field {
+    padding: 0px;
+}
+
+.openerp .oe_mail_msg_content td.oe_form_group_cell {
+    vertical-align: bottom;
+}
+
+/* subject: change width */
+.openerp .oe_mail_msg_content .oe_form .oe_form_field input {
+    width: 472px;
+}
+
+div.cleditorMain {
+    width: 468px !important;
+    height: 100px !important;
+}
+
 
 /* ------------------------------------------------------------ */
 /* Messages layout

From 4cbc8a921b107bfaee7db0971aa317bf8b158f6d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:17:52 +0530
Subject: [PATCH 168/397] [IMP]:mrp:removed tabs

bzr revid: apa@tinyerp.com-20120705064752-uzfgjsi0jvbh35vd
---
 addons/mrp/mrp_view.xml | 92 ++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e72ae082fcf..df46d33f255 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -336,52 +336,52 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                	<sheet>
-	                    <label for="product_id" class="oe_edit_only"/>
-	                    <h1>
-	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
-	                        <field name="product_qty" class="oe_inline"/>
-	                        <field name="product_uom" class="oe_inline"/>
-	                    </h1>
-	                    <label for="routing_id" class="oe_edit_only"/>
-	                    <h2>
-	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-	                    </h2>
-	                    <group>
-	                        <group>
-	                            <field name="name"/>
-	                            <field name="code" string="Reference"/>
-	                        </group>
-	                        <group>
-	                            <field name="type"/>
-	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                    <sheet>
+                        <label for="product_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline"/>
+                        </h1>
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2>
+                            <field name="routing_id"  groups="mrp.group_mrp_routings"/>
+                        </h2>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="code" string="Reference"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
                                 <div groups="product.group_uos" >
                                     <field name="product_uos_qty" 
                                         class="oe_inline"/>
                                     <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
                                     <field name="product_uos" class="oe_inline"/>
                                 </div>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Components">
-	                            <field name="bom_lines" widget="one2many_list">
-	                                <tree string="Components" editable="bottom">
-	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-	                                    <field name="product_qty" string="Product Quantity"/>
-	                                    <field name="product_uom"/>
-	                                    <field name="name" invisible="1"/>
-	                                    <field name="date_start"/>
-	                                    <field name="date_stop"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-	                            <field name="revision_ids"/>
-	                        </page>
-	                        <page string="Properties" groups="product.group_mrp_properties">
-	                            <group>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Components">
+                                <field name="bom_lines" widget="one2many_list">
+                                    <tree string="Components" editable="bottom">
+                                        <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                        <field name="product_qty" string="Product Quantity"/>
+                                        <field name="product_uom"/>
+                                        <field name="name" invisible="1"/>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+                                <field name="revision_ids"/>
+                            </page>
+                            <page string="Properties" groups="product.group_mrp_properties">
+                                <group>
                                         <group>
                                             <field name="position"/>
                                             <field name="bom_id"/>
@@ -394,12 +394,12 @@
                                             <field name="product_rounding"/>
                                             <field name="product_efficiency"/>
                                         </group>
-	                            </group>
-	                            <separator string="Properties"/>
-	                            <field name="property_ids" widget="many2many_tags" />
-	                        </page>
-	                    </notebook>
-	                    <newline/>
+                                </group>
+                                <separator string="Properties"/>
+                                <field name="property_ids" widget="many2many_tags" />
+                            </page>
+                        </notebook>
+                        <newline/>
                     </sheet>
                 </form>
             </field>

From f9f68fb2f17184029f1d0287d486b8068f94af8f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 13:13:33 +0530
Subject: [PATCH 169/397] [IMP]MRP :BOM view are improved

bzr revid: hsa@tinyerp.com-20120705074333-re3dyycj5ktkocbq
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0b725108be4..149ef5e717f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -381,8 +381,10 @@
                                         <field name="active"/>
                                     </group>
                                     <group>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
+                                        <label for="date_start" string="Validity"/>
+                                        <div name="validity">
+                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>
                                     </group>

From cca9a711c5ed92a53e46fdfb456d4e8e55d2b6f8 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 15:30:06 +0530
Subject: [PATCH 170/397] [IMP]sale-crm-imp

bzr revid: pna@tinyerp.com-20120705100006-uhhkms5ya687iopc
---
 addons/sale/stock_view.xml  | 2 +-
 addons/stock/stock_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 242d2c4cef6..9e71f14f49e 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
+                <field name="move_type" position="before">
                     <field name="sale_id"/>
                 </field>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55be1fdc267..dfbb1211167 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -864,7 +864,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note..."/>
+                            <field name="note" placeholder="Add an internal note"/>
                         </page>
                     </notebook>
                 </sheet>

From b1221084236c718da455bc2019d89ac3c1b2a02a Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 15:32:39 +0530
Subject: [PATCH 171/397] [IMP]res-partner-imp-server

bzr revid: pna@tinyerp.com-20120705100239-3ajqioc3uzw3q0vb
---
 openerp/addons/base/res/res_partner.py       |  2 +-
 openerp/addons/base/res/res_partner_view.xml | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 2165c8ad16d..b7ca88f0585 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -138,7 +138,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5159a7075cc..94524242541 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -117,11 +117,13 @@
                             <label for="parent_id" class="oe_edit_only"/>
                         </div>
                         <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                            <field name="parent_id"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                class="oe_inline"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
-                            <field name="function" class="oe_inline" placeholder="Job Position"/>
+                            <group colspan="4">
+                                <field name="parent_id"
+                                    domain="[('is_company', '=', True)]" nolabel="1" context="{'default_is_company': True}"
+                                    class="oe_inline"
+                                    on_change="onchange_address(use_parent_address, parent_id)"/>, 
+                                <field name="function" nolabel="1" class="oe_inline" placeholder="Job Position"/>
+                            </group>
                         </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
@@ -220,13 +222,17 @@
                                 <group>
                                     <field name="user_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
+                                <group>
+                                    <field name="customer"/>
+                                    <field name="supplier"/>
+                                </group>
+                                <group>
                                     <field name="ref"/>
                                     <field name="lang"/>
                                     <field name="date"/>
                                 </group>
                                 <group>
-                                    <field name="customer"/>
-                                    <field name="supplier"/>
                                     <field name="active"/>
                                 </group>
                             </group>

From 3f5f105c97e1ac2546abe94e6ce321017b809f32 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 16:19:58 +0530
Subject: [PATCH 172/397] [IMP]res-partner-imp-server

bzr revid: pna@tinyerp.com-20120705104958-ahdmc32kynu4t0cj
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index b7ca88f0585..2165c8ad16d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -138,7 +138,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),

From 502de7ba97ca5d9765601df68db4937690719017 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 5 Jul 2012 17:06:04 +0530
Subject: [PATCH 173/397] [IMP]MRP :BOM Properties view are improved

bzr revid: hsa@tinyerp.com-20120705113604-0uy5a013eltntp6i
---
 addons/mrp/mrp_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 149ef5e717f..1e7a686acc1 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -382,8 +382,10 @@
                                     </group>
                                     <group>
                                         <label for="date_start" string="Validity"/>
-                                        <div name="validity">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
+                                        <div>
+                                            <field name="date_start" class="oe_online" nolabel="1"/>
+                                            <label string="-"/>
+                                            <field name="date_stop" class="oe_online" nolabel="1"/>
                                         </div>
                                         <field name="product_rounding"/>
                                         <field name="product_efficiency"/>

From 62e79c8401e38ea17f622ed999a6b4b6bd0b1899 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 17:36:11 +0530
Subject: [PATCH 174/397] [IMP] change as per review

bzr revid: kjo@tinyerp.com-20120705120611-mavp52c52psenqiw
---
 addons/crm_fundraising/crm_fundraising_menu.xml     |  2 +-
 addons/import_sugarcrm/import_sugarcrm_view.xml     |  2 +-
 addons/membership/membership.py                     | 12 ++++++------
 addons/project_long_term/project_long_term_view.xml |  8 +++++---
 addons/wiki_sale_faq/wiki_sale_faq_view.xml         |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index 38187ed1d4d..20fcdeee861 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -9,7 +9,7 @@
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-        <field name="name">Funds</field>
+        <field name="name">Fund Raising</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7188108ba6c..9f38f4e1959 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -13,7 +13,7 @@
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" />
+                        type="object" class="oe_highlight" /> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index dc4eadbada9..06b84ec80c5 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -315,11 +315,11 @@ class Partner(osv.osv):
         return self._membership_state(*args, **kwargs)
 
     _columns = {
-        'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
+        'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
+        'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
         'membership_amount': fields.float(
-                    'Membership amount', digits=(16, 2),
+                    'Membership Amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state,
@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start membership date', type = 'date',
+                    string = 'Start Membership Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop membership date', type='date', multi='membership_stop',
+                    string = 'Stop Membership Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
@@ -354,7 +354,7 @@ class Partner(osv.osv):
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
                     _membership_date,
-                    string = 'Cancel membership date', type='date', multi='membership_cancel',
+                    string = 'Cancel Membership Date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a98e9088402..7e24c61e769 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -164,10 +164,12 @@
                     <label for="date_start" string="Duration"/>
                     <div>
                         <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
+                            <field name="date_start" class="oe_inline"/>
+                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <field name="date_end" class="oe_inline"/>
                         </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                        <field name="duration" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline"/>
                     </div>
                     </group>
                     <notebook>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index b43649af23a..f3116bc73b5 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -17,7 +17,7 @@
        </record>
 
        <record model="ir.actions.act_window" id="action_wiki_test">
-           <field name="name">Wiki Pages</field>
+           <field name="name">Sales FAQ</field>
            <field name="res_model">wiki.wiki</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>

From f3e8ac8cd204d08c64d3640bebe2846f4e653947 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 18:01:34 +0530
Subject: [PATCH 175/397] [IMP] remove placeholder for job_position field

bzr revid: kjo@tinyerp.com-20120705123134-otyd3ist3clnmfb6
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 20dd00a4656..2fedcc01e68 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -137,7 +137,7 @@
                                 </td>
                                 <td>
                                     <h2>
-                                        <field nolabel="1" name="function" class="oe_inline" placeholder="Job Position"/>
+                                        <field nolabel="1" name="function" class="oe_inline"/>
                                     </h2>
                                 </td>
                             </tr>

From 0347a93cda49a84dfec96059a42e279b3722bf69 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 5 Jul 2012 18:12:33 +0530
Subject: [PATCH 176/397] [FIX]: IMprovement in view. duration field also.

bzr revid: atp@tinyerp.com-20120705124233-6jchsxi9m6pvqvtr
---
 addons/account/account_invoice_view.xml       |  7 +++--
 addons/account_budget/account_budget_view.xml |  4 +--
 .../account_payment/account_payment_view.xml  |  4 +--
 .../account_voucher/account_voucher_view.xml  | 25 ++++++++---------
 .../voucher_sales_purchase_view.xml           | 28 +++++++++----------
 .../analytic_contract_project_view.xml        |  2 +-
 addons/l10n_ch/wizard/bvr_import_view.xml     |  4 +--
 .../point_of_sale/account_statement_view.xml  |  2 +-
 8 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46d3412f3b2..d4b8eac6750 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -51,7 +51,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group>
-                    	<group>
+                        <group>
                           <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                           <field name="name"/>
                           <label string="Quantity" for="quantity" align="1.0"/>
@@ -190,7 +190,7 @@
                           <field name="fiscal_position" widget="selection"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
-                         <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
+                          <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
                           <field name="currency_id"/>
                           <field name="type" invisible="1"/>
@@ -227,10 +227,10 @@
                                             <field name="factor_tax" invisible="True"/>
                                         </tree>
                                     </field>
-                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                    <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
                                     <field name="residual" style="margin-top: 10px"/>
@@ -363,6 +363,7 @@
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
+                                     <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 86e7cf3219d..59ae6364ce2 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -156,9 +156,9 @@
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from"/>
+                                                    <field name="date_from" class="oe_inline"/>
                                                      <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
-                                                    <field name="date_to"/>
+                                                    <field name="date_to" class="oe_inline"/>
                                                 </div>
                                             </group>
                                             <group>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a57721d9657..29da4c12e06 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="before">
                     <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>      
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a53482cf176..383abe92ddc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -85,23 +85,22 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                             <group>
-                             <group>
-                                <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                             </group>
-                               <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
+                            <group>
+                               <group>
+                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                               </group>
+                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
                                    <group>
-                                     <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <label for="tax_id"/>
+                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
                                    </group>
                                    <group>
-                                   <field name="amount_untaxed" readonly="1"/>
-                                     <field name="tax_amount" readonly="1"/>
-                                     <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                    </group>
-                              </group>
-                              <group>
-                                   <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                              </group>
+                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 1c2fb977ea6..61c938e070e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -131,23 +131,21 @@
                                       <field name="narration" placeholder="Add a internal note." nolabel="1" />
                                 </group>
                                 <group class="oe_subtotal_footer oe_right">
-                                  <group>
-                                     <field name="tax_id"
-                                      on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
-                                      widget="selection"
-                                      domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
-                                  </group>
-                                  <group>
-                                       <field name="amount_untaxed"/>
-                                       <field name="tax_amount" readonly="1"/>
-                                       <field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id"
+                                           on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                           widget="selection"
+                                           nolabel="1"
+                                           domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <button type="object" colspan="2" name="compute_tax" icon="terp-stock_format-scientific" string="Compute Tax" class="oe_inline oe_left" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                            <field name="amount_untaxed"/>
+                                            <field name="tax_amount" readonly="1" />
+                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
                                     </group>
                                 </group>
-                               <group>
-                                  <button type="object"
-                                        icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
-                                         attrs="{'invisible': [('state','!=','draft')]}"/>
-                               </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 0e61fe08d01..49f5738df59 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -15,7 +15,7 @@
                             <group string="Validity">
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                    <field name="date_start" class="oe_inline"/>  <span  attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span> <field name="date" class="oe_inline"/>
                                 </div>
                                 <label for="quantity_max"/>
                                 <div>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 0fd445f71bc..e9dab515bf8 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -34,9 +34,9 @@
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
+                <xpath expr="//button[@string='Import Invoices']" position="after">
                     <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
                 </xpath>
             </field>
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index c67fcd0e9fe..e5baaca393d 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -105,7 +105,7 @@
             <field name="inherit_id" ref="account.view_cash_statement_tree"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
-                    <field name="user_id"/>
+                    <field name="user_id" string="Responsible"/>
                 </field>
             </field>
         </record>

From 0019a9e506b3b7ea004e8b70a29e6030342c8f9b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 5 Jul 2012 18:30:47 +0530
Subject: [PATCH 177/397] [REM]: REMOVE Duplicate button

bzr revid: atp@tinyerp.com-20120705130047-w757z7ngo2otfo12
---
 addons/account/account_invoice_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d4b8eac6750..ae47c998d60 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -357,13 +357,13 @@
                                             <field name="factor_tax" invisible="True"/>
                                         </tree>
                                     </field>
-                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
-                                        type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
-                                        help="This action will erase taxes"/>
+
                                 </div>
                                 <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
-                                     <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                    <button  colspan="2" name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
+                                        type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
+                                        help="This action will erase taxes"/>
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 

From 09701b83acbade29fdebc471730ccbafa4d8c75e Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 11:32:56 +0530
Subject: [PATCH 178/397] [IMP]Sale Quotation : view are improved

bzr revid: hsa@tinyerp.com-20120706060256-ymn92nvfmf1m4ctq
---
 addons/delivery/delivery_view.xml       |  4 ++--
 addons/sale/sale_view.xml               | 12 +++++++-----
 addons/sale_margin/sale_margin_view.xml |  9 +++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..094bf426e88 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -256,12 +256,12 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='sale_total']" position="after">
+                <xpath expr="//group[@name='sale_delivery']" position="inside">
                     <group>
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object" class="oe_inline"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
                     </group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5d6b5346eb..42a141befd0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,6 +244,9 @@
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                            <div>
+                                                <field name="notes" nolabel="1" placeholder="Add a note on order line..."/>
+                                            </div>
                                         </div>
                                     </group>
                                 </form>
@@ -264,11 +267,10 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
+                            <group name="sale_delivery">
+                            </group>
                             <div>
-                                <field name="note" class="oe_inline"/>
+                                <field name="note" nolabel="1" class="oe_online" placeholder="Add a global note on the sale order..."/>
                             </div>
                         </page>
                         <page string="Other Information" groups="base.group_user">
@@ -300,7 +302,7 @@
                                 <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
                                     <field name="date_invoice"/>
                                     <field name="number"/>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" string="Customer"/>
                                     <field name="user_id"/>
                                     <field name="date_due"/>
                                     <field name="amount_total"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index c45cd228dec..c56e66e5ae2 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,8 +8,13 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_total']" position="inside">
-                <field name="margin"/>
+            <xpath expr="//group[@name='sale_delivery']" position="inside">
+                <group>
+                    <label for="margin"/>
+                    <div>
+                        <field name="margin"/>
+                    </div>
+                </group>
             </xpath>
         </field>
     </record>

From 907b1ca49f266aeadb82aeed52728a0e9a9f8308 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:15:08 +0530
Subject: [PATCH 179/397] [IMP]project_long_term: set attrs

bzr revid: kjo@tinyerp.com-20120706064508-7s2r3ivfu30vmt0p
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7e24c61e769..aed6492d78a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -165,7 +165,7 @@
                     <div>
                         <div>
                             <field name="date_start" class="oe_inline"/>
-                            <label string=" - " class="oe_inline oe_edit_only"/>
+                            <label string=" - " attrs="{'invisible':[('date_start','=', False),('date_end','=', False)]}"/>
                             <field name="date_end" class="oe_inline"/>
                         </div>
                         <field name="duration" class="oe_inline"/>

From ad76a5430f04073fb1fbbf5d836ad167667db75e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 13:08:37 +0530
Subject: [PATCH 180/397] [FIX]: Bank statement

bzr revid: atp@tinyerp.com-20120706073837-9exeh7u00caun46s
---
 addons/account_payment/account_payment_view.xml |  6 +++---
 addons/l10n_ch/wizard/bvr_import_view.xml       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 29da4c12e06..c652d82cfb1 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="before">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>
+             <xpath expr="//div[@name='import_buttons']" position="inside">
+                  <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+              </xpath>
             </field>
         </record>
 
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index e9dab515bf8..d6b7c9d1314 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -30,15 +30,15 @@
             <field name="target">new</field>
         </record>
         
-        <record model="ir.ui.view" id="view_bank_statement_form">
+        <record model="ir.ui.view" id="view_bank_statement_form_bvr">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
-                </xpath>
+            <xpath expr="//div[@name='import_buttons']" position="inside">
+                   <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+              </xpath>
             </field>
         </record>
     </data>

From 3770835114b56f028e5e1dec51fcf9cfbbc15e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 09:38:52 +0200
Subject: [PATCH 181/397] [WIP] Chatter: embedded form view: work in progress
 to make it work.

bzr revid: tde@openerp.com-20120706073852-1j0uj60l64xxrpzk
---
 addons/mail/static/src/css/mail.css           |  1 +
 addons/mail/wizard/mail_compose_message.py    | 59 ++++++++++---------
 .../mail/wizard/mail_compose_message_view.xml |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 5571cb06876..d1cc9a92416 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -299,6 +299,7 @@
     width: 472px;
 }
 
+/* body_html: cleditor */
 div.cleditorMain {
     width: 468px !important;
     height: 100px !important;
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 9834dfad8a6..ae46c12f957 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -33,7 +33,7 @@ from ..mail_message import to_email
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
-class mail_compose_message(osv.osv_memory):
+class mail_compose_message(osv.TransientModel):
     """Generic Email composition wizard. This wizard is meant to be inherited
        at model and view level to provide specific wizard features.
 
@@ -73,46 +73,49 @@ class mail_compose_message(osv.osv_memory):
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         vals = {}
+        result = {}
+
         reply_mode = context.get('mail.compose.message.mode') == 'reply'
-        if (not reply_mode) and context.get('active_model') and context.get('active_id'):
-            # normal mode when sending an email related to any document, as specified by
-            # active_model and active_id in context
-            # if a message_id is specified in context, this means we send an e-mail related
-            # to a document, but based on a previous e-mail
-            if context.get('message_id'):
-                vals = self.get_message_data(cr, uid, int(context['message_id']), context=context)
-            vals.update(self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context))
-        elif reply_mode and context.get('active_id'):
-            # reply mode, consider active_id is the ID of a mail.message to which we're
-            # replying
-            if context.get('message_id'):
-                vals = self.get_message_data(cr, uid, int(context['message_id']), context=context)
-            else:
-                vals = self.get_message_data(cr, uid, int(context['active_id']), context)
-        else:
-            # default mode
-            result['model'] = context.get('active_model', False)
-        
+
+        """ comment mode: active_model, active_id = model and ID of a document which we are commenting """
+        """ reply mode: active_id = ID of a mail.message to which we are replying """
+        """ mass_mailing mode: active_model, active_id  = model and ID of a document which we are commenting """
+        """ default: comment mode """
+
+        mode = context.get('mail.compose.message.mode', 'comment')
+        if mode in ['comment', 'mass_mail'] and context.get('active_model') and context.get('active_id'):
+            vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
+        elif mode == ['reply'] and context.get('active_id'):
+            vals = self.get_message_data(cr, uid, int(context['active_id']), context)
+
         for field in vals:
             if field in fields:
-                result.update({field : vals[field]})
+                result[field] = vals[field]
 
         # link to model and record if not done yet
-        if not result.get('model') or not result.get('res_id'):
-            active_model = context.get('active_model')
-            res_id = context.get('active_id')
-            if active_model and active_model not in (self._name, 'mail.message'):
-                result['model'] = active_model
-                if res_id:
-                    result['res_id'] = res_id
+        if not result.get('model') and context.get('active_model'):
+            result['model'] = context.get('active_model')
+        if not result.get('res_id') and context.get('active_id'):
+            result['res_id'] = context.get('active_id')
+            if result['model'] == 'mail.message' and not result.get('parent_id'):
+                result['parent_id'] = context.get('active_id')
 
         # Try to provide default email_from if not specified yet
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
+
+        print result
         return result
 
+    def create(self, cr, uid, values, context):
+        print values
+        return super(mail_compose_message, self).create(cr, uid, values, context)
+
     _columns = {
+        'tmp_partner_ids': fields.many2many('res.partner',
+            'email_message_send_partner_rel',
+            'wizard_id', 'partner_id', 'Destination partners'),
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0d74f082f70..59af4647f9b 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -51,7 +51,7 @@
                                 class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
-                        <field name="destination_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
+                        <field name="tmp_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
                         <a href="#" class="mail_compose_message_toggle">Extended email</a>

From bd3a82c2505c77c9f32ec0665f7efeed783b1035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 09:44:35 +0200
Subject: [PATCH 182/397] [IMP] HTML text field: implemented the get_value to
 retrieve the html value from the ClEditor.

bzr revid: tde@openerp.com-20120706074435-v3882oyuzbrffqnr
---
 addons/web/static/src/js/view_form.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3f4a447f0ca..23107b108ee 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2316,6 +2316,13 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
                         "margin:4px; font:13px monospace; cursor:text"
         });
     },
+    get_value: function() {
+        // retrive cleditor and get its html content
+        var textarea_node = this.$element.find('textarea.field_text');
+        var cleditor = textarea_node.cleditor()[0];
+        var value = cleditor.$area.val();
+        return value;
+    },
 });
 
 instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({

From 7972b399abe9889b1fa3b610a801b95c9df660da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 11:41:41 +0200
Subject: [PATCH 183/397] [CLEAN] mail: cleaned mail_message.

bzr revid: tde@openerp.com-20120706094141-lwhuk2g4jqlb11yt
---
 addons/mail/mail_message.py                | 107 +++++++++------------
 addons/mail/wizard/mail_compose_message.py |   5 -
 2 files changed, 45 insertions(+), 67 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f9de63e00ba..b0c2df9c1b0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -40,31 +40,22 @@ import tools
 
 _logger = logging.getLogger(__name__)
 
-def format_date_tz(date, tz=None):
-    if not date:
-        return 'n/a'
-    format = tools.DEFAULT_SERVER_DATETIME_FORMAT
-    return tools.server_to_local_timestamp(date, format, format, tz)
-
-def truncate_text(text):
-    lines = text and text.split('\n') or []
-    if len(lines) > 3:
-        res = '\n\t'.join(lines[:3]) + '...'
-    else:
-        res = '\n\t'.join(lines)
-    return res
-
+""" Some tools for parsing / creating email fields """
 def decode(text):
     """Returns unicode() string conversion of the the given encoded smtp header text"""
     if text:
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
-def to_email(text):
+def mail_tools_to_email(text):
     """Return a list of the email addresses found in ``text``"""
     if not text: return []
     return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
+# TODO: remove that after cleaning
+def to_email(text):
+    return mail_tools_to_email(text)
+
 class mail_message_common(osv.TransientModel):
     """Common abstract class for holding the main attributes of a 
        message object. It could be reused as parent model for any
@@ -93,22 +84,7 @@ class mail_message_common(osv.TransientModel):
         #   - args: [('body', 'ilike', 'blah')]
         return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
     
-    def name_get(self, cr, uid, ids, context=None):
-        res = []
-        for message in self.browse(cr, uid, ids, context=context):
-            name = ''
-            if message.subject:
-                name = '%s: ' % (message.subject)
-            if message.body_text:
-                name = '%s%s ' % (name, message.body_text[0:20])
-            if message.date:
-                name = '%s(%s)' % (name, message.date)
-            res.append((message.id, name))
-        return res
-
     def get_record_name(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
         result = dict.fromkeys(ids, '')
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
@@ -135,31 +111,36 @@ class mail_message_common(osv.TransientModel):
         'subject': fields.char('Subject', size=512),
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(get_record_name, type='string', string='Message Record Name',
-                        help="Name of the record, matching the result of the name_get."),
+        'record_name': fields.function(get_record_name, type='string',
+            string='Message Record Name',
+            help="Name get of the related document."),
         'date': fields.datetime('Date'),
         'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
         'email_to': fields.char('To', size=256, help='Message recipients'),
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'destination_partner_ids': fields.many2many('res.partner',
-            'mail_message_common_partners_destination_rel',
-            'common_id', 'partner_id', 'Destination partners'),
+        'partner_ids': fields.many2many('res.partner',
+            'mail_message_common_destination_partner_rel',
+            'common_id', 'partner_id', 'Destination partners',
+            help="When sending emails through the social network composition wizard"\
+                 "you may choose to send a copy of the mail to partners."),
         'headers': fields.text('Message Headers', readonly=1,
-                        help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
+            help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'content_subtype': fields.char('Message content subtype', size=32,
-                                            oldname="subtype", readonly=1,
-                                            help="Type of message, usually 'html' or 'plain', used to \
-                                                  select plain-text or rich-text contents accordingly"),
+            oldname="subtype", readonly=1,
+            help="Type of message, usually 'html' or 'plain', used to select "\
+                  "plain-text or rich-text contents accordingly"),
         'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
-        'body': fields.function(get_body, fnct_search = search_body, string='Message Content', type='text',
-                        help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
-        'parent_id': fields.many2one('mail.message', 'Parent Message', help="Parent message, used for displaying as threads with hierarchy",
-                        select=True, ondelete='set null',),
+        'body': fields.function(get_body, fnct_search = search_body, type='text',
+            string='Message Content', store=True,
+            help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
+        'parent_id': fields.many2one('mail.message', 'Parent Message',
+            select=True, ondelete='set null',
+            help="Parent message, used for displaying as threads with hierarchy"),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
     }
 
@@ -186,17 +167,17 @@ class mail_message(osv.Model):
     # XXX to review - how to determine action to use?
     def open_document(self, cr, uid, ids, context=None):
         action_data = False
-        if ids:
-            msg = self.browse(cr, uid, ids[0], context=context)
-            model = msg.model
-            res_id = msg.res_id
-
-            ir_act_window = self.pool.get('ir.actions.act_window')
-            action_ids = ir_act_window.search(cr, uid, [('res_model', '=', model)])
-            if action_ids:
-                action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
-                action_data.update({
-                    'domain' : "[('id','=',%d)]"%(res_id),
+        if not ids:
+            return action_data
+        # works only on 1 item
+        id = ids[0]
+        msg = self.browse(cr, uid, id, context=context)
+        ir_act_window = self.pool.get('ir.actions.act_window')
+        action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context)
+        if action_ids:
+            action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
+            action_data.update({
+                    'domain' : "[('id', '=', %d)]" % (msg.res_id),
                     'nodestroy': True,
                     'context': {}
                     })
@@ -205,14 +186,16 @@ class mail_message(osv.Model):
     # XXX to review - how to determine action to use?
     def open_attachment(self, cr, uid, ids, context=None):
         action_data = False
+        if not ids:
+            return action_data
         action_pool = self.pool.get('ir.actions.act_window')
-        message = self.browse(cr, uid, ids, context=context)[0]
-        att_ids = [x.id for x in message.attachment_ids]
-        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
+        messages = self.browse(cr, uid, ids, context=context)
+        att_ids = [x.id for x in message.attachment_ids for message in messages]
+        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context)
         if action_ids:
             action_data = action_pool.read(cr, uid, action_ids[0], context=context)
             action_data.update({
-                'domain': [('id','in',att_ids)],
+                'domain': [('id', 'in', att_ids)],
                 'nodestroy': True
                 })
         return action_data
@@ -278,7 +261,7 @@ class mail_message(osv.Model):
         ima_obj = self.pool.get('ir.model.access')
         for model, mids in res_ids.items():
             # ignore mail messages that are not attached to a resource anymore when checking access rights
-            # (resource was deleted but attachment was not)
+            # (resource was deleted but message was not)
             mids = self.pool.get(model).exists(cr, uid, mids)
             ima_obj.check(cr, uid, model, mode)
             self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
@@ -634,12 +617,12 @@ class mail_message(osv.Model):
                 # without queuing
                 msg = ir_mail_server.build_email(
                     email_from=message.email_from,
-                    email_to=to_email(message.email_to),
+                    email_to=mail_tools_to_email(message.email_to),
                     subject=message.subject,
                     body=body,
                     body_alternative=body_alternative,
-                    email_cc=to_email(message.email_cc),
-                    email_bcc=to_email(message.email_bcc),
+                    email_cc=mail_tools_to_email(message.email_cc),
+                    email_bcc=mail_tools_to_email(message.email_bcc),
                     reply_to=message.reply_to,
                     attachments=attachments, message_id=message.message_id,
                     references = message.references,
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index ae46c12f957..a763a4ba6c2 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -105,13 +105,8 @@ class mail_compose_message(osv.TransientModel):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
 
-        print result
         return result
 
-    def create(self, cr, uid, values, context):
-        print values
-        return super(mail_compose_message, self).create(cr, uid, values, context)
-
     _columns = {
         'tmp_partner_ids': fields.many2many('res.partner',
             'email_message_send_partner_rel',

From 3e31df9f1745f43fb1cbee929d2eccdaf304dd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 12:11:30 +0200
Subject: [PATCH 184/397] [IMP] mail_compose_message: cleaned default_get,
 models and misc.

bzr revid: tde@openerp.com-20120706101130-94bwiswel46qo52b
---
 addons/mail/wizard/mail_compose_message.py    | 64 +++++++++----------
 .../mail/wizard/mail_compose_message_view.xml |  4 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index a763a4ba6c2..239379f5bb9 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -41,13 +41,12 @@ class mail_compose_message(osv.TransientModel):
        parameters, among which are:
 
          * mail.compose.message.mode: if set to 'reply', the wizard is in 
-                      reply mode and pre-populated with the original quote.
-                      If set to 'mass_mail', the wizard is in mass mailing
-                      where the mail details can contain template placeholders
-                      that will be merged with actual data before being sent
-                      to each recipient. Recipients will be derived from the
-                      records determined via  ``context['active_model']`` and
-                      ``context['active_ids']``.
+            reply to a previous message mode and pre-populated with the original
+            quote. If set to 'comment', it means you are writing a new message to
+            be attached to a document. If set to 'mass_mail', the wizard is in
+            mass mailing where the mail details can contain template placeholders
+            that will be merged with actual data before being sent to each
+            recipient.
          * active_model: model name of the document to which the mail being
                         composed is related
          * active_id: id of the document to which the mail being composed is
@@ -67,50 +66,51 @@ class mail_compose_message(osv.TransientModel):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         """
-        print 'default_get'
-        print context
         if context is None:
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         vals = {}
-        result = {}
-
-        reply_mode = context.get('mail.compose.message.mode') == 'reply'
-
-        """ comment mode: active_model, active_id = model and ID of a document which we are commenting """
-        """ reply mode: active_id = ID of a mail.message to which we are replying """
-        """ mass_mailing mode: active_model, active_id  = model and ID of a document which we are commenting """
-        """ default: comment mode """
-
-        mode = context.get('mail.compose.message.mode', 'comment')
-        if mode in ['comment', 'mass_mail'] and context.get('active_model') and context.get('active_id'):
-            vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
-        elif mode == ['reply'] and context.get('active_id'):
-            vals = self.get_message_data(cr, uid, int(context['active_id']), context)
 
+        """ Composition mode
+        - comment: default mode; active_model, active_id = model and ID of a
+          document we are commenting,
+        - reply: active_id = ID of a mail.message to which we are replying. From
+          this message we can find the related model and res_id,
+        - mass_mailing mode: active_model, active_id  = model and ID of a
+          document we are commenting,
+        """
+        compose_mode = context.get('mail.compose.message.mode', 'comment')
+        active_model = context.get('active_model')
+        active_id = context.get('active_id')
+        if compose_mode in ['reply']:
+            vals = self.get_message_data(cr, uid, int(context['active_id']), context=context)
+        elif compose_mode in ['comment', 'mass_mail'] and active_model and active_id:
+            vals = self.get_value(cr, uid, active_model, active_id, context)
         for field in vals:
             if field in fields:
                 result[field] = vals[field]
 
         # link to model and record if not done yet
-        if not result.get('model') and context.get('active_model'):
-            result['model'] = context.get('active_model')
-        if not result.get('res_id') and context.get('active_id'):
-            result['res_id'] = context.get('active_id')
-            if result['model'] == 'mail.message' and not result.get('parent_id'):
-                result['parent_id'] = context.get('active_id')
+        if not result.get('model') and active_model:
+            result['model'] = active_model
+        if not result.get('res_id') and active_id:
+            result['res_id'] = active_id
+            # if result['model'] == 'mail.message' and not result.get('parent_id'):
+            #     result['parent_id'] = context.get('active_id')
 
         # Try to provide default email_from if not specified yet
         if not result.get('email_from'):
-            current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             result['email_from'] = current_user.user_email or False
 
         return result
 
     _columns = {
-        'tmp_partner_ids': fields.many2many('res.partner',
+        'dest_partner_ids': fields.many2many('res.partner',
             'email_message_send_partner_rel',
-            'wizard_id', 'partner_id', 'Destination partners'),
+            'wizard_id', 'partner_id', 'Destination partners',
+            help="When sending emails through the social network composition wizard"\
+                 "you may choose to send a copy of the mail to partners."),
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 59af4647f9b..87666389cfc 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -37,7 +37,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="email_compose_message_wizard_form2">
+        <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
             <field name="priority">1</field>
@@ -51,7 +51,7 @@
                                 class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
-                        <field name="tmp_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
+                        <field name="dest_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
                         <a href="#" class="mail_compose_message_toggle">Extended email</a>

From d18206a2251951a19c7646b338394440466e9599 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 16:00:51 +0530
Subject: [PATCH 185/397] [IMP] change view of sale,stock and membership

bzr revid: kjo@tinyerp.com-20120706103051-k3ep6fibqaxelgj2
---
 addons/membership/membership_view.xml | 9 +++------
 addons/sale/sale_view.xml             | 2 --
 addons/stock/stock_view.xml           | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 0f2ad6836c8..cfc3d855671 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -239,13 +239,10 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group>
+                            <group col="3">
                                 <field name="free_member"/>
-                                <label for="membership_state"/>
-                                <div>
-                                    <field name="membership_state" class="oe_inline"/>
-                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                </div>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                <field name="membership_state" class="oe_inline"/>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 42a141befd0..3f774ef3cbb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -174,8 +174,6 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
-
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dfbb1211167..5185c22b371 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -850,7 +850,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Additional info">
+                        <page string="Additional Info">
                             <group>
                                 <group>
                                     <field name="move_type"/>

From e99fb67bc66a3d93061b8f1c60072337d5b50dbb Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 19:09:41 +0530
Subject: [PATCH 186/397] [IMP]crm: improve meeting view

bzr revid: kjo@tinyerp.com-20120706133941-a1spe9qj8dtevco8
---
 addons/account/partner_view.xml | 76 ++++++++++++++++-----------------
 addons/crm/crm_meeting_view.xml | 39 +++++++----------
 addons/wiki/wiki_view.xml       |  2 +-
 3 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ec3dcba3b84..a916a59c42a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -76,56 +76,56 @@
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
-                    <group col="4">
-                        <group string="Customer Accounting Properties" col="4">
+                    <group>
+                        <group >
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
                         </group>
-                        <group string="Supplier Accounting Properties" col="4">
+                        <group>
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
                         </group>
-                        <group string="Customer Credit" col="4">
+                        <group>
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
-                        <group string="Supplier Debit" col="4">
+                        <group>
                             <field name="debit"/>
                         </group>
-                        <field name="bank_ids">
-                            <form string="Bank account" version="7.0">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                                <group>
-                                    <group name="owner" string="Bank Account Owner">
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="owner_name"/>
-                                        <label for="street" string="Address"/>
-                                        <div>
-                                            <field name="street" placeholder="Street..."/>
-                                            <div>
-                                                <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                                <field name="city" class="oe_inline" placeholder="City"/>
-                                            </div>
-                                            <field name="state_id" placeholder="State"/>
-                                            <field name="country_id" placeholder="Country"/>
-                                        </div>
-                                    </group>
-                                    <group name="bank" string="Information About the Bank">
-                                        <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                        <field name="bank_name"/>
-                                        <field name="bank_bic" placeholder="[Identifier code]"/>
-                                    </group>
-                                </group>
-                            </form>
-                            <tree string="Bank Details">
-                                <field name="sequence" invisible="1"/>
-                                <field name="acc_number"/>
-                                <field name="bank_name"/>
-                                <field name="owner_name"/>
-                            </tree>
-                        </field>
                     </group>
+                    <field name="bank_ids">
+                        <form string="Bank account" version="7.0">
+                            <field name="state"/>
+                            <field name="acc_number"/>
+                            <group>
+                                <group name="owner" string="Bank Account Owner">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                    <field name="owner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <field name="street" placeholder="Street..."/>
+                                        <div>
+                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                            <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                        <field name="state_id" placeholder="State"/>
+                                        <field name="country_id" placeholder="Country"/>
+                                    </div>
+                                </group>
+                                <group name="bank" string="Information About the Bank">
+                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
+                                    <field name="bank_name"/>
+                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                </group>
+                            </group>
+                        </form>
+                        <tree string="Bank Details">
+                            <field name="sequence" invisible="1"/>
+                            <field name="acc_number"/>
+                            <field name="bank_name"/>
+                            <field name="owner_name"/>
+                        </tree>
+                    </field>
                 </page>
                 </page>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 88ef7134735..a007fc99091 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,9 +51,9 @@
         <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action"
+     <!--menuitem action="crm_meeting_categ_action"
         groups="base.group_no_one"
-        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
+        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/-->
 
     <!-- CRM Meetings Form View -->
 
@@ -87,41 +87,32 @@
                     </div>
                     <group>
                         <h2>
-                            <label for="date" string="Starting at"/>
                             <field name="date" required="1" class="oe_inline"/>
-                            <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
+                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
                         <h2>
                             <label for="duration" string="Duration" />
-                            <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"
-                                class="oe_inline"/> ( 
-                            <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"                            
-                                class="oe_inline"/> )
+                            
                         </h2>
                     </group>
                 <group colspan="4" col="4">
                     <group colspan="2">
                         <field name="user_id" />
-                        <field name="organizer"/>
                         <field name="section_id" widget="selection"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
-                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
-                    </group>
-                    <group colspan="2">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
                     <group colspan="2">
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                        <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
@@ -129,9 +120,9 @@
                         <field name="recurrent_id" invisible="1"/>
                         <field name="recurrent_uid" invisible="1"/>
                     </group>
+                    <group colspan="2">
+                    </group>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
                     <page string="Invitation Detail">
                         <button string="Invite People"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 700585122d3..0aabcd5b59f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -155,7 +155,7 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="4" string="Meta Information"/>
-                            <field name="tags"/>
+                            <field name="tags" widget="many2many_tags"/>
                             <field name="toc" groups="base.group_no_one"/>
                         </group>
                     </sheet>

From 2a382252e828a19e96f18bac8a44b25c7849e21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 17:51:13 +0200
Subject: [PATCH 187/397] [WIP] TextHtml field: updated behavior to work in
 form views (display field value, take into account a modified value).

bzr revid: tde@openerp.com-20120706155113-co8higd2mm1qki00
---
 addons/web/static/src/js/view_form.js | 59 ++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 23107b108ee..1abc71a0826 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2298,10 +2298,10 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  */
 instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
 
-    set_value: function(value_) {
-        this._super.apply(this, arguments);
-        var textarea_node = this.$element.find('textarea.field_text');
-        textarea_node.cleditor({
+    initialize_content: function() {
+        console.log('initialize_content');
+        this.$textarea = this.$element.find('textarea');
+        this.$textarea.cleditor({
           //width:        500, // width not including margins, borders or padding
           //height:       250, // height not including margins, borders or padding
           controls:     // controls to add to the toolbar
@@ -2315,11 +2315,58 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
           bodyStyle:    // style to assign to document body contained within the editor
                         "margin:4px; font:13px monospace; cursor:text"
         });
+        // cleditor.bind('change', function(event) {
+        //     console.log(event)
+        // });
+        // call super now, because cleditor seems to reset the disable attr
+        this._super.apply(this, arguments);
+        if (this.$textarea.attr('disabled') == 'disabled') {
+            this.$textarea.cleditor()[0].disable(true);
+        }
+        else {
+            this.$textarea.cleditor()[0].disable(false);
+        }
     },
+
+    set_value: function(value_) {
+        console.log('set_value');
+        console.log(value_);
+        this._super.apply(this, arguments);
+        // debugger
+        this._dirty_flag = true;
+        // this.render_value();
+    },
+    render_value: function() {
+        console.log('render_value');
+        var show_value = instance.web.format_value(this.get('value'), this, '');
+        console.log(show_value);
+        this.$textarea.val(show_value);
+        if (show_value && this.view.options.resize_textareas) {
+            this.do_resize(this.view.options.resize_textareas);
+        }
+        this.$textarea.cleditor()[0].updateFrame();
+    },
+
+    // render_value: function() {
+    //     console.log('render_value');
+    //     this._super.apply(this, arguments);
+    //     console.log(instance.web.format_value(this.get('value'), this, ''));
+    //     this.$textarea.cleditor()[0].updateFrame();
+
+    // },
+
+    // set_value: function(value_) {
+    //     console.log('set_value');
+    //     console.log(value_);
+    //     this._super.apply(this, arguments);
+    // },
+
     get_value: function() {
+        console.log('get_value');
         // retrive cleditor and get its html content
-        var textarea_node = this.$element.find('textarea.field_text');
-        var cleditor = textarea_node.cleditor()[0];
+        var cleditor = this.$textarea.cleditor()[0];
+        console.log(this.$textarea.val());
+        // cleditor.updateTextArea();
         var value = cleditor.$area.val();
         return value;
     },

From d32c2a2efbe07d5a313b4d5d6241af1564b391df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 17:51:41 +0200
Subject: [PATCH 188/397] [IMP] mail.compose.message wizard: WIP about new
 behavior.

bzr revid: tde@openerp.com-20120706155141-u1h3y84i5f31ejoo
---
 addons/mail/wizard/mail_compose_message.py    | 107 ++++++++++++++++++
 .../mail/wizard/mail_compose_message_view.xml |  20 +++-
 2 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 239379f5bb9..29dc11d2ebe 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -68,6 +68,8 @@ class mail_compose_message(osv.TransientModel):
         """
         if context is None:
             context = {}
+        print 'default_get'
+        print context
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         vals = {}
 
@@ -184,6 +186,111 @@ class mail_compose_message(osv.TransientModel):
                 })
         return result
 
+    def compose_message(self, cr, uid, ids, context=None):
+        '''Process the wizard contents and proceed with sending the corresponding
+           email(s), rendering any template patterns on the fly if needed.
+           If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
+           set to ``'mass_mail'``), the resulting email(s) are scheduled for being
+           sent the next time the mail.message scheduler runs, or the next time
+           ``mail.message.process_email_queue`` is called.
+           Otherwise the new message is sent immediately.
+
+           :param dict context: several context values will modify the behavior
+                                of the wizard, cfr. the class description.
+        '''
+        print 'compose_message'
+        print context
+        if context is None:
+            context = {}
+        mail_message = self.pool.get('mail.message')
+        for mail_wiz in self.browse(cr, uid, ids, context=context):
+            # attachments
+            attachment = {}
+            for attach in mail_wiz.attachment_ids:
+                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
+
+            # composition wizard options
+            email_mode = context.get('email_mode')
+            formatting = context.get('formatting')
+
+            # default message values according to the wizard options
+            if formatting:
+                content_subtype = 'html'
+            else:
+                content_subtype='text'
+            if email_mode:
+                type = 'email'
+            else:
+                type = 'comment'
+            references = None
+            headers = {}
+            body = mail_wiz.body_html if mail_wiz.content_subtype == 'html' else mail_wiz.body_text
+
+            # Get model, and check whether it is OpenChatter enabled, aka inherit from mail.thread
+            if context.get('mail.compose.message.mode') == 'mass_mail':
+                if context.get('active_ids') and context.get('active_model'):
+                    active_ids = context['active_ids']
+                    active_model = context['active_model']
+                else:
+                    active_model = mail_wiz.model
+                    active_model_pool = self.pool.get(active_model)
+                    active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
+            else:
+                active_model = mail_wiz.model
+                active_ids = [int(mail_wiz.res_id)]
+            active_model_pool = self.pool.get(active_model)
+            if hasattr(active_model_pool, '_inherit') and 'mail.thread' in active_model_pool._inherit:
+                mail_thread_enabled = True
+            else:
+                mail_thread_enabled = False
+            
+            # Reply Email
+            if context.get('mail.compose.message.mode') == 'reply' and mail_wiz.message_id:
+                references = (mail_wiz.references or '') + " " + mail_wiz.message_id
+                headers['In-Reply-To'] = mail_wiz.message_id
+
+            if context.get('mail.compose.message.mode') == 'mass_mail':
+                # Mass mailing: must render the template patterns
+                for active_id in active_ids:
+                    subject = self.render_template(cr, uid, mail_wiz.subject, active_model, active_id)
+                    rendered_body = self.render_template(cr, uid, body, active_model, active_id)
+                    email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
+                    email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
+                    email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
+                    email_bcc = self.render_template(cr, uid, mail_wiz.email_bcc, active_model, active_id)
+                    reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
+    
+                    # in mass-mailing mode we only schedule the mail for sending, it will be 
+                    # processed as soon as the mail scheduler runs.
+                    if mail_thread_enabled:
+                        active_model_pool.message_append(cr, uid, [active_id],
+                            subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=mail_wiz.content_subtype, state='outgoing',
+                            email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
+                            reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
+                    else:
+                        mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
+                            model=mail_wiz.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
+                            attachments=attachment, references=references, res_id=active_id,
+                            content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
+            else:
+                # normal mode - no mass-mailing
+                if mail_thread_enabled:
+                    print mail_wiz.body_html
+                    msg_ids = active_model_pool.message_append(cr, uid, active_ids,
+                            mail_wiz.subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=content_subtype, state='outgoing',
+                            email_to=mail_wiz.email_to, email_from=mail_wiz.email_from, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
+                            reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context,
+                            type=type)
+                else:
+                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), mail_wiz.subject, body,
+                        model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
+                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id),
+                        content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
+                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
+                mail_message.send(cr, uid, msg_ids, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
     def send_mail(self, cr, uid, ids, context=None):
         '''Process the wizard contents and proceed with sending the corresponding
            email(s), rendering any template patterns on the fly if needed.
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 87666389cfc..5a3711c10f3 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -53,10 +53,22 @@
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
                         <field name="dest_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
-                        <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
-                        <a href="#" class="mail_compose_message_toggle">Extended email</a>
-                        <span>Checklist</span>
-                        <span>Attach</span>
+                        <button icon="gtk-ok" name="compose_message" string="Post" type="object"/>
+                        <a href="#" class="oe_mail_compose_message_email">Send an email</a>
+                        <div class='oe_mail_compose_message_icons'>
+                            <a href="#" class="oe_mail_compose_message_checklist">
+                                <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
+                                    title='Add a checklist'/>
+                            </a>
+                            <a href="#" class="oe_mail_compose_message_attachment">
+                                <img src='/mail/static/src/img/attachment.png/' alt='Attachment'
+                                    title='Add an attachment'/>
+                            </a>
+                            <a href="#" class="oe_mail_compose_message_formatting">
+                                <img src='/mail/static/src/img/formatting.png/' alt='Formatting'
+                                    title='Switch to advanced formatting mode'/>
+                            </a>
+                        </div>
                     </group>
                 </form>
             </field>

From 28611901c9d64e4523101b3d8001810fe6784f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 17:52:01 +0200
Subject: [PATCH 189/397] [REM] Removed crm_add_note.

bzr revid: tde@openerp.com-20120706155201-nsgixesgxgiru0bu
---
 addons/crm/__openerp__.py               |  1 -
 addons/crm/wizard/__init__.py           |  2 -
 addons/crm/wizard/crm_add_note.py       | 53 -------------------------
 addons/crm/wizard/crm_add_note_view.xml | 39 ------------------
 4 files changed, 95 deletions(-)
 delete mode 100644 addons/crm/wizard/crm_add_note.py
 delete mode 100644 addons/crm/wizard/crm_add_note_view.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..0435a450f11 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -85,7 +85,6 @@ Creates a dashboard for CRM that includes:
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
-        'wizard/crm_add_note_view.xml',
         'wizard/crm_merge_opportunities_view.xml',
 
         'crm_view.xml',
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 2fc39c51505..462c8b91b67 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import mail_compose_message
-import crm_add_note
-
 import crm_lead_to_partner
 import crm_lead_to_opportunity
 import crm_phonecall_to_phonecall
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
deleted file mode 100644
index 02f592f0136..00000000000
--- a/addons/crm/wizard/crm_add_note.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from .. import crm
-from osv import fields, osv
-from tools.translate import _
-from mail.mail_message import truncate_text
-
-AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
-
-class crm_add_note(osv.osv_memory):
-    """Adds a new note to the case."""
-    _name = 'crm.add.note'
-    _description = "Add Internal Note"
-
-    _columns = {
-        'body': fields.text('Note Body', required=True),
-        'state': fields.selection(AVAILABLE_STATES, string='Set New State To',
-                                  required=True),
-    }
-
-    _defaults = {
-        'state': 'unchanged'
-    }
-
-    def action_add(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-
-        if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not add note!'))
-
-        model = context.get('active_model')
-        case_pool = self.pool.get(model)
-
-        for obj in self.browse(cr, uid, ids, context=context):
-            case_list = case_pool.browse(cr, uid, context['active_ids'],
-                                         context=context)
-            case = case_list[0]
-            case_pool.message_append(cr, uid, [case], truncate_text(obj.body),
-                                     body_text=obj.body)
-            if obj.state == 'unchanged':
-                pass
-            elif obj.state == 'done':
-                case_pool.case_close(cr, uid, [case.id])
-            elif obj.state == 'draft':
-                case_pool.case_reset(cr, uid, [case.id])
-            elif obj.state in ['cancel', 'open', 'pending']:
-                act = 'case_' + obj.state
-                getattr(case_pool, act)(cr, uid, [case.id])
-
-        return {'type': 'ir.actions.act_window_close'}
-
-crm_add_note()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
deleted file mode 100644
index 93551eaf943..00000000000
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-<!-- Add New Note view -->
-
-        <record model="ir.ui.view" id="crm_add_new_note_view">
-            <field name="name">crm.new.add.note.form</field>
-            <field name="model">crm.add.note</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Add Note" version="7.0">
-                    <header>
-                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group>
-                        <separator string="Add Note"/>
-                        <field name="body"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!-- Add New Note action -->
-
-        <record model="ir.actions.act_window" id="action_crm_add_note">
-            <field name="name">Add Note</field>
-            <field name="res_model">crm.add.note</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_add_new_note_view"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
-

From 094b1938b885f3d12ebf04c6c2f29ea0e4e48f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Jul 2012 17:52:26 +0200
Subject: [PATCH 190/397] [IMP] mail: take into account the modified wizard in
 css and js.

bzr revid: tde@openerp.com-20120706155226-1en2wrefpg3uek1c
---
 addons/mail/mail_message_view.xml             |  4 +-
 .../static/src/css/mail_compose_message.css   |  9 ++++
 addons/mail/static/src/js/mail.js             | 51 ++++++++++++++++---
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index a0d7f8ef853..c70b4a4bc7e 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -34,7 +34,7 @@
                                 <field name="date"/>
                                 <field name="type"/>
                                 <field name="content_subtype"/>
-                                <field name="destination_partner_ids" widget="many2many_tags" readonly="1"/>
+                                <field name="partner_ids" widget="many2many_tags" readonly="1"/>
                             </group>
                             <group>
                                 <field name="model"/>
@@ -127,7 +127,7 @@
                                 </group>
                                 <group string="Partner information">
                                     <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                                    <field name="destination_partner_ids" readonly="1" WIDGET="many2many_tags"/>
+                                    <field name="partner_ids" readonly="1" WIDGET="many2many_tags"/>
                                 </group>
                                 <notebook>
                                     <page string="Body (Rich)">
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 02b056377d3..58f900389d5 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -5,3 +5,12 @@
 .openerp tr td .oe_form_field.oe_mail_compose_message_invisible {
     display: none;
 }
+
+.openerp .oe_mail_compose_message_icons {
+    text-align: right;
+}
+
+.openerp .oe_mail_compose_message_icons img {
+    width: 20px;
+    height: 20px;
+}
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a14383dad4d..545f99b3591 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -243,13 +243,21 @@ openerp.mail = function(session) {
     mail.ComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
         
+        /**
+         * @param {Object} parent parent
+         * @param {Object} [params]
+         * @param {String} [params.res_model] res_model of document [REQUIRED]
+         * @param {Number} [params.res_id] res_id of record [REQUIRED]
+         */
         init: function(parent, params) {
             this._super(parent);
+            console.log(parent);
             // options
             this.params = params || {};
-            this.params.extended_mode = params.extended_mode || false;
+            this.params.email_mode = params.email_mode || false;
+            this.params.formatting = params.formatting || false;
             // create a context for the default_get of the compose form
-            var context = {test: 'test-first'};
+            var context = {active_model: this.params.res_model, active_id: this.params.res_id};
             // create a form_view on the mail.compose.message wizard
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
@@ -283,16 +291,41 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'Send a Message' link that toggles the
-            // advanced options for writing a message
-            this.$element.find('a.mail_compose_message_toggle').click(function (event) {
+            // event: click on 'Send a Message' link that toggles the form for
+            // sending an email (partner_ids)
+            this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
                 event.preventDefault();
-                self.params.extended_mode = ! self.params.extended_mode;
+                self.params.email_mode = ! self.params.email_mode;
+                // update context of datasetsearch
+                self.ds_compose.context.email_mode = self.params.email_mode;
+                // toggle display
+                self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
+            });
+            // event: click on 'Formatting' icon-link that toggles the advanced
+            // formatting options for writing a message (subject, body_html)
+            this.$element.find('a.oe_mail_compose_message_formatting').click(function (event) {
+                event.preventDefault();
+                self.params.formatting = ! self.params.formatting;
+                // update context of datasetsearch
+                self.ds_compose.context.formatting = self.params.formatting;
                 // toggle display
                 self.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
                 self.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
-                self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
+            });
+            // event: click on 'Attachment' icon-link that opens the dialog to
+            // add an attachment.
+            this.$element.find('a.oe_mail_compose_message_attachment').click(function (event) {
+                event.preventDefault();
+                // not yet implemented
+                console.log('attachment');
+            });
+            // event: click on 'Checklist' icon-link that toggles the options
+            // for adding checklist.
+            this.$element.find('a.oe_mail_compose_message_checklist').click(function (event) {
+                event.preventDefault();
+                // not yet implemented
+                console.log('checklist');
             });
         },
         
@@ -385,7 +418,9 @@ openerp.mail = function(session) {
             $.when(display_done).then(this.proxy('do_customize_display'));
             
             // add message composition form view
-            this.compose_message = new mail.ComposeMessage(this, {'extended_mode': false, 'uid': this.params.uid});
+            this.compose_message = new mail.ComposeMessage(this, {
+                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
+                'res_id': this.params.res_id });
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message.appendTo(composition_node);

From ba6439548a0df4167e6baa3d9095f6c8177dd75f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 11:10:08 +0530
Subject: [PATCH 191/397] [IMP] change in view

bzr revid: kjo@tinyerp.com-20120709054008-ico77jmm32mcztx2
---
 addons/base_calendar/base_calendar.py         |  6 +++---
 addons/crm/crm_meeting_view.xml               | 10 +++++-----
 addons/document/document_view.xml             |  7 +++----
 .../import_sugarcrm/import_sugarcrm_view.xml  |  3 ++-
 addons/product/product_view.xml               | 19 +++++++------------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bbededc8eaf..3b8e37e8697 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show as', states={'done': [('readonly', True)]}),
+                                                'Show Time As', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
@@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
-        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
-        'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
+        'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
+        'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a007fc99091..79ed5a3adb2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -88,7 +88,7 @@
                     <group>
                         <h2>
                             <field name="date" required="1" class="oe_inline"/>
-                            at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
+                            <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
                     <group>
@@ -104,15 +104,15 @@
                         <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
                         <field name="email_from"/>
                     </group>
-                    <group colspan="2">
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/> 
+                    <group> 
                         <field name="date_deadline" 
                                 string="End Date" required="1"
                                 on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"/>
                         <field name="alarm_id" string="Reminder" widget="selection" />
                         <field name="class" string="Privacy"/>
-                        <field name="show_as" string="Show Time as"/>
+                        <field name="show_as"/>
                         <field name="categ_id" widget="selection"
                             string="Meeting Type"
                             domain="[('object_id.model', '=', 'crm.meeting')]" />
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..b8954eb248b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -250,7 +250,7 @@
                     <notebook colspan="4">
                     <page string="Attachment">
                         <group>
-                            <group string="Data">
+                            <group>
                                 <field name="type"/>
                                 <newline />
                                 <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
@@ -261,14 +261,13 @@
                                 <field name="res_id" invisible="True"/>
                                 <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
                                 <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <separator string="Related to" colspan="2"/>
                                 <field name="partner_id"/>
                             </group>
-                            <group groups="base.group_no_one" string="Created">
+                            <group groups="base.group_no_one">
                                 <field name="create_uid" readonly="1"/>
                                 <field name="create_date" readonly="1"/>
                             </group>
-                            <group groups="base.group_no_one" string="Modified">
+                            <group groups="base.group_no_one">
                                 <field name="write_uid" readonly="1"/>
                                 <field name="write_date" readonly="1"/>
                             </group>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 9f38f4e1959..7f751a38729 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,8 +12,9 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
+                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object" class="oe_highlight" /> or
+                        type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>
             </header>
             <sheet>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..25367538c3f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,19 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <label for="name" class="oe_edit_only"/>
-                                <field name="name"/>
-                            </h1>
-                        </div>
                         <group>
-                                <group>
-                                    <field name="type"/>
-                                </group>
-                                <group>
-                                    <field name="parent_id"/>
-                                </group>
+                            <group>
+                                <field name="name"/>
+                                <field name="parent_id"/>
+                            </group>
+                            <group>
+                                <field name="type"/>
+                            </group>
                         </group>
                         <group name="basic">
                             <group name="account_property" string="Account Properties"/>

From 963d91ce638eb1469fdf9b22319a80a040e4b12b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 11:10:33 +0530
Subject: [PATCH 192/397] [IMP]ir_attachment view change

bzr revid: kjo@tinyerp.com-20120709054033-5rtixxld4r5cr0lh
---
 openerp/addons/base/ir/ir.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 88843b207f9..1a0a8dcf33d 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -769,12 +769,12 @@
                                 <field name="datas_fname"/>
                                 <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
                             </group>
-                            <group string="Attached To">
+                            <group>
                                 <field name="res_model"/>
                                 <field name="res_id"/>
                                 <field name="res_name"/>
                             </group>
-                            <group groups="base.group_no_one" string="Created">
+                            <group groups="base.group_no_one">
                                 <field name="create_uid"/>
                                 <field name="create_date"/>
                             </group>

From 6206d0df144d07e7f0ff5a5e8281b80fc1d987e9 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Mon, 9 Jul 2012 13:42:27 +0530
Subject: [PATCH 193/397] [IMP]customer-invoice-view

bzr revid: pja@tinyerp.com-20120709081227-t5bplfrzwv57pdmu
---
 addons/account/account_invoice_view.xml       | 7 +++----
 addons/account/wizard/account_move_journal.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b7e815601ab..49e2d0ea781 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -308,11 +308,10 @@
                         <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                         <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
                         <field name="number" readonly="1" class="oe_inline"/>
+                        <label string="-" class="oe_inline"/>
+                        <field name="name" placeholder="Project XYZ" class="oe_inline"/>
                     </h1>
-                    <label string="Concerns" for="name" class="oe_edit_only"/>
-                    <h2>
-                        <field name="name" placeholder="Project XYZ"/>
-                    </h2>
+                    
                     <field name="type" invisible="1"/>
                     <group>
                         <group>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index c484da72304..cf1c819b19f 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -102,7 +102,7 @@ class account_move_journal(osv.osv_memory):
                 period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
                 period_string = _("Period: %s") % tools.ustr(period)
     
-            separator_string = _("Open Journal Items !")
+            separator_string = _("")
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">

From b1dc0beb352a5d09632a17897efc46b4e4fa7363 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 15:39:03 +0530
Subject: [PATCH 194/397] [IMP]account: change account.analytic.line view

bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
---
 addons/account/project/project_view.xml       | 34 ++++++++-----------
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../project_timesheet_view.xml                |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7658ab111d9..e0e5df040fa 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -123,33 +123,27 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="account_id"/>
-                            <field name="journal_id"/>
+                            <field name="date"/>
+                            <label for="unit_amount"/>
+                                <group class="oe_inline">
+                                    <field name="unit_amount" nolabel="1"/>
+                                    <field name="product_uom_id" nolabel="1" />
+                                </group>
+                            <field name="amount"/>
+                        </group>
+                        <group>
+                            <field name="account_id"/>
+                            <field name="journal_id"/>
+                            <field name="product_id"/>
                         </group>
                         <group>
-                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" class="oe_inline"/>
-                                <field name="product_uom_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="General Accounting">
+                        <group>
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
+                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d07314498e1..92873614172 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -114,7 +114,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
-                <field name="product_uom_id" position="after">
+                <field name="amount" position="before">
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
                 </field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2e2ec7f2677..9fb145aa536 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,7 +70,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                   <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
+                   <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>

From 86a0371d00be9bd5252c39cae3f77528e5df3002 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 9 Jul 2012 16:00:49 +0530
Subject: [PATCH 195/397] [IMP] improve Accounting reports wizards and Supplier
 invoice/refund.

bzr revid: shp@tinyerp.com-20120709103049-jqoz1opqtsiq3uiy
---
 addons/account/account_invoice_view.xml       | 29 +++++++++----------
 addons/account/account_view.xml               |  2 --
 .../wizard/account_report_common_view.xml     |  8 ++---
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b7e815601ab..2564f2adc5d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -163,38 +163,35 @@
                 <sheet string="Supplier Invoice">
                   <div class="oe_title">
                   <h1>
-                     <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                     <label string="Draft Invoice/ref " attrs="{'invisible': [('state','not in',('draft',))]}"/>
                      <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                      <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                     <span attr="{'invisible': [('origin','=',False)]}"> - </span> 
+                     <field name="origin" placeholder="PO 002" class="oe_inline"/>
                      <field name="number" readonly="1" class="oe_inline"/>
                   </h1>
-                    <label string="Concerns" for="origin" class="oe_edit_only"/>
-                    <h2>
-                        <field name="origin" placeholder="PO 002"/> From
-                        <field string="Supplier" name="partner_id"
-                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
-                      </h2>
                     </div>
                     <group>
                        <group>
-                         <field name="date_invoice"/>
-                         <field name="date_due"/>
-                         <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                         <label for="reference"/>
+                         <field string="Supplier" name="partner_id"
+                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
+                              domain="[('supplier', '=', True)]"/>
+                          <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                          <field name="reference_type" class="oe_inline" nolabel="1"/>
                          <div>
-                          <field name="reference_type"/>
-                          <field name="reference" placeholder="Payment Reference"/>
+                          <field name="reference" placeholder="Payment Reference" class="oe_inline"/>
                          </div>
                        </group>
                        <group>
+                          <field name="date_invoice"/>
+                          <field name="date_due"/>
                           <field name="fiscal_position" widget="selection"/>
+                          <field name="currency_id"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
-                          <field name="currency_id"/>
                           <field name="type" invisible="1"/>
                         </group>
                     </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c525ca9eb78..0fecb8ded12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -17,7 +17,6 @@
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar" nolabel="1" />
                 </header>
-                <sheet string="Fiscalyear" >
                     <group>
                         <group>
                             <field name="name"/>
@@ -41,7 +40,6 @@
                             </group>
                         </form>
                     </field>
-                </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..ff3c7aef187 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -26,12 +26,12 @@
                             <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
                         </group>
                         <group string="Dates" col="4">
-                            <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
-                            <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                            <field name="date_from" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+                            <field name="date_to" attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
                         </group>
                         <group string="Periods" col="4">
-                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">

From 73b7c1f8ae255dbf6a92fd6c51e01e3ff4f127d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 9 Jul 2012 12:31:37 +0200
Subject: [PATCH 196/397] [CLEAN] TextFieldHtml: cleaned code (removed debug
 and comments).

bzr revid: tde@openerp.com-20120709103137-0662p5zbi4ib3zky
---
 addons/web/static/src/js/view_form.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1abc71a0826..2a32f7c47af 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2315,9 +2315,6 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
           bodyStyle:    // style to assign to document body contained within the editor
                         "margin:4px; font:13px monospace; cursor:text"
         });
-        // cleditor.bind('change', function(event) {
-        //     console.log(event)
-        // });
         // call super now, because cleditor seems to reset the disable attr
         this._super.apply(this, arguments);
         if (this.$textarea.attr('disabled') == 'disabled') {
@@ -2329,17 +2326,12 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
     },
 
     set_value: function(value_) {
-        console.log('set_value');
-        console.log(value_);
         this._super.apply(this, arguments);
-        // debugger
         this._dirty_flag = true;
-        // this.render_value();
     },
+
     render_value: function() {
-        console.log('render_value');
         var show_value = instance.web.format_value(this.get('value'), this, '');
-        console.log(show_value);
         this.$textarea.val(show_value);
         if (show_value && this.view.options.resize_textareas) {
             this.do_resize(this.view.options.resize_textareas);
@@ -2347,25 +2339,9 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
         this.$textarea.cleditor()[0].updateFrame();
     },
 
-    // render_value: function() {
-    //     console.log('render_value');
-    //     this._super.apply(this, arguments);
-    //     console.log(instance.web.format_value(this.get('value'), this, ''));
-    //     this.$textarea.cleditor()[0].updateFrame();
-
-    // },
-
-    // set_value: function(value_) {
-    //     console.log('set_value');
-    //     console.log(value_);
-    //     this._super.apply(this, arguments);
-    // },
-
     get_value: function() {
-        console.log('get_value');
         // retrive cleditor and get its html content
         var cleditor = this.$textarea.cleditor()[0];
-        console.log(this.$textarea.val());
         // cleditor.updateTextArea();
         var value = cleditor.$area.val();
         return value;

From a900a06f9d00aef229d023ed22e1325f347158a0 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 16:10:23 +0530
Subject: [PATCH 197/397] [IMP]l10n_fr_rib: set xpath

bzr revid: kjo@tinyerp.com-20120709104023-31dczp1vq59kyr09
---
 addons/l10n_fr_rib/bank_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index b3062f4c706..38c51df58e0 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>

From 158ffb05dfa1cd6588256426b8d218b6d1f9263e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 10 Jul 2012 11:15:35 +0530
Subject: [PATCH 198/397] [IMP]set priority for account.analytic.line form

bzr revid: kjo@tinyerp.com-20120710054535-ggqe2amf122y6d8s
---
 addons/account/project/project_view.xml         | 5 +++--
 addons/import_sugarcrm/import_sugarcrm_view.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e0e5df040fa..4af08c7766c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -118,6 +118,7 @@
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
+            <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Analytic Entry" version="7.0">
                     <group>
@@ -245,8 +246,8 @@
                         <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                         <field invisible="True" name="general_account_id"/>
                         <field name="amount"/>
-                        <field name="currency_id" />
-                        <field name="amount_currency" />
+                        <field name="currency_id"/>
+                        <field name="amount_currency"/>
                         <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     </group>
                 </form>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 7f751a38729..6ef9be1a5bd 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,7 +12,6 @@
             <header>
                 <button name="import_all" string="_Import"
                         type="object" class="oe_highlight"/>
-                <label string=" "/>
                 <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
                         type="object"/> or
                 <button special="cancel" string="_Cancel" class="oe_link"/>

From 309f538936092e93b0883077c6e26f3c15365bde Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 10 Jul 2012 11:44:24 +0530
Subject: [PATCH 199/397] [IMP]res_partner: add separator between company and
 job field

bzr revid: kjo@tinyerp.com-20120710061424-x1g1lthyu8al0jz4
---
 openerp/addons/base/res/res_partner_view.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 2fedcc01e68..90857abfe9c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -121,6 +121,8 @@
                             
                                     </div>
                                 </td>
+                                <td>
+                                </td>
                                 <td>
                                     <label for="function" class="oe_edit_only"/>
                                 </td>
@@ -133,6 +135,12 @@
                                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                             class="oe_inline"
                                             on_change="onchange_address(use_parent_address, parent_id)"/>
+                                        
+                                    </h2>
+                                </td>
+                                <td>
+                                    <h2>
+                                        <label string="," class="oe_inline" attrs="{'invisible': ['|', ('parent_id', '=', False), ('function', '=', False)]}"/>
                                     </h2>
                                 </td>
                                 <td>

From b1f09441cd63adf921b5dff88150ab057be97ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 14:34:01 +0200
Subject: [PATCH 200/397] [REM] TextFieldHemolt: removed debug log.

bzr revid: tde@openerp.com-20120710123401-9dsdg6tvhczan51l
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2d7d87c4092..c82bf528491 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2303,7 +2303,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
 instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
 
     initialize_content: function() {
-        console.log('initialize_content');
         this.$textarea = this.$element.find('textarea');
         this.$textarea.cleditor({
           //width:        500, // width not including margins, borders or padding

From 1d3e3c53faf275ea5847da94350b5417d49a2ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 15:05:39 +0200
Subject: [PATCH 201/397] [IMP] Chatter: added 'Reply' link for emails;
 replaced some old internal_links to new #model ... res_id.

bzr revid: tde@openerp.com-20120710130539-30esjtmcp5yecg5x
---
 addons/mail/static/src/xml/mail.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 167d6a86f00..d3b803ecd5d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -139,6 +139,7 @@
                             <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
                             <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                         </t>
+                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Repzefly</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
@@ -148,11 +149,11 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
-                        <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
+                        <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
                     <div class="oe_mail_msg_body">
-                        <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a>
-                        <t t-raw="record.body"/>
+                        <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
+                        <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
                     </div>
                     <ul class="oe_mail_msg_footer">
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>

From 8ab1b22d1ec92be55d7f06f070e6705bea280cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 15:06:31 +0200
Subject: [PATCH 202/397] [IMP] Chatter: composition form: added 'reply'
 behavior. Code is still dirty.

bzr revid: tde@openerp.com-20120710130631-nehjl8988ucm6w2n
---
 addons/mail/static/src/js/mail.js          | 100 +++++++++++++--------
 addons/mail/wizard/mail_compose_message.py |  35 ++++----
 2 files changed, 80 insertions(+), 55 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 545f99b3591..8e562601942 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -144,6 +144,11 @@ openerp.mail = function(session) {
             return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
         },
 
+        /* Add a prefix before each new line of the original string */
+        do_text_quote: function (str, prefix) {
+            return str.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2' + prefix || '> ');
+        },
+
         /**
          * Replaces some expressions
          * - @login - shorcut to link to a res.user, given its login
@@ -248,6 +253,14 @@ openerp.mail = function(session) {
          * @param {Object} [params]
          * @param {String} [params.res_model] res_model of document [REQUIRED]
          * @param {Number} [params.res_id] res_id of record [REQUIRED]
+         * @param {Number} [params.email_mode] true/false, tells whether
+         *      we are in email sending mode
+         * @param {Number} [params.formatting] true/false, tells whether
+         *      we are in advance formatting mode
+         * @param {String} [params.model] mail.compose.message.mode (see
+         *      composition wizard)
+         * @param {Number} [params.msg_id] id of a message in case we are in
+         *      reply mode
          */
         init: function(parent, params) {
             this._super(parent);
@@ -256,20 +269,26 @@ openerp.mail = function(session) {
             this.params = params || {};
             this.params.email_mode = params.email_mode || false;
             this.params.formatting = params.formatting || false;
+            this.params.mode = params.mode || 'comment';
+            if (this.params.mode == 'reply') {
+                this.params.active_id = this.params.msg_id;
+            } else {
+                this.params.active_id = this.params.res_id;
+            }
             // create a context for the default_get of the compose form
-            var context = {active_model: this.params.res_model, active_id: this.params.res_id};
+            var context = {'active_model': this.params.res_model, 'active_id': this.params.active_id,
+                'mail.compose.message.mode': this.params.mode};
             // create a form_view on the mail.compose.message wizard
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
                 action_buttons: false,
                 pager: false,
                 initial_mode: 'edit',
-                }
-            );
+                });
         },
-        
+
         /**
-         * widget start function
+         * Widget start function
          * - builds and initializes the form view */
         start: function() {
             var self = this;
@@ -285,7 +304,11 @@ openerp.mail = function(session) {
                 self.form_view.do_show();
             });
         },
-        
+
+        destroy: function() {
+            this._super.apply(this, arguments);
+        },
+
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
@@ -318,19 +341,23 @@ openerp.mail = function(session) {
             this.$element.find('a.oe_mail_compose_message_attachment').click(function (event) {
                 event.preventDefault();
                 // not yet implemented
-                console.log('attachment');
+                self.set_body_value('attachment', 'attachment');
             });
             // event: click on 'Checklist' icon-link that toggles the options
             // for adding checklist.
             this.$element.find('a.oe_mail_compose_message_checklist').click(function (event) {
                 event.preventDefault();
                 // not yet implemented
-                console.log('checklist');
+                self.set_body_value('checklist', 'checklist');
             });
         },
-        
-        destroy: function() {
-            this._super.apply(this, arguments);
+
+        /**
+         * Update the values of the composition form; with possible different
+           values for body_text and body_html. */
+        set_body_value: function(body_text, body_html) {
+            this.form_view.fields.body_text.set_value(body_text);
+            this.form_view.fields.body_html.set_value(body_html);
         },
     }),
 
@@ -372,6 +399,7 @@ openerp.mail = function(session) {
          */
         init: function(parent, params) {
             this._super(parent);
+            // options
             this.params = params;
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
@@ -398,8 +426,6 @@ openerp.mail = function(session) {
         },
         
         start: function() {
-            var self = this;
-            
             this._super.apply(this, arguments);
 
             // // customize display
@@ -409,27 +435,32 @@ openerp.mail = function(session) {
 
             // add events
             this.add_events();
-            
             // display user, fetch comments
             this.display_current_user();
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
             else var display_done = this.init_comments();
             // customize display
-            $.when(display_done).then(this.proxy('do_customize_display'));
-            
+            $.when(display_done).then(this.proxy('do_customize_display'));            
             // add message composition form view
-            this.compose_message = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id });
-            var composition_node = this.$element.find('div.oe_mail_thread_action');
-            composition_node.empty();
-            var compose_done = this.compose_message.appendTo(composition_node);
-            
+            var compose_done = this.instantiate_composition_form();
             return display_done && compose_done;
         },
-        
+
+        instantiate_composition_form: function(mode, msg_id) {
+            if (this.compose_message_widget) {
+                this.compose_message_widget.destroy();
+            }
+            this.compose_message_widget = new mail.ComposeMessage(this, {
+                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
+                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
+            var composition_node = this.$element.find('div.oe_mail_thread_action');
+            composition_node.empty();
+            var compose_done = this.compose_message_widget.appendTo(composition_node);
+            return compose_done;
+        },
+
         do_customize_display: function() {
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').eq(0).show(); }
+            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
             if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
             if (! this.display.show_msg_menu) { this.$element.find('img.oe_mail_msg_menu_icon').hide(); }
         },
@@ -480,19 +511,14 @@ openerp.mail = function(session) {
             });
             // event: click on "reply by email" in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
-                var msg_id = event.srcElement.dataset.id;
+                var msg_id = event.srcElement.dataset.msg_id;
+                console.log(msg_id)
                 if (! msg_id) return false;
-                self.do_action({
-                        type: 'ir.actions.act_window',
-                        res_model: 'mail.compose.message',
-                        views: [[false, 'form']],
-                        view_type: 'form',
-                        view_mode: 'form',
-                        target: 'new',
-                        context: {'active_model': self.params.res_model, 'active_id': self.params.res_id, 'message_id': msg_id, 'mail.compose.message.mode': 'reply'},
-                        key2: 'client_action_multi',
-                });
-                return false;
+                // var parent_node = $(event.srcElement).parents('div.oe_mail_msg_content').eq(0);
+                // var text_content = $(parent_node).find('div.oe_mail_msg_record_body').eq(0).html();
+                // self.compose_message.set_body_value(text_content, text_content);
+                event.preventDefault();
+                self.instantiate_composition_form('reply', msg_id);
             });
             // event: click on 'hide this type' in wheel_menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 24da7b07ba3..5031a8c5dea 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -60,30 +60,29 @@ class mail_compose_message(osv.TransientModel):
     _description = 'Email composition wizard'
 
     def default_get(self, cr, uid, fields, context=None):
-        """Overridden to provide specific defaults depending on the context
-           parameters.
+        """ Overridden to provide specific defaults depending on the context
+            parameters.
+
+            Composition mode
+            - comment: default mode; active_model, active_id = model and ID of a
+            document we are commenting,
+            - reply: active_id = ID of a mail.message to which we are replying.
+            From this message we can find the related model and res_id,
+            - mass_mailing mode: active_model, active_id  = model and ID of a
+            document we are commenting,
 
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         """
         if context is None:
             context = {}
-        print 'default_get'
-        print context
-        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
-        vals = {}
-
-        """ Composition mode
-        - comment: default mode; active_model, active_id = model and ID of a
-          document we are commenting,
-        - reply: active_id = ID of a mail.message to which we are replying. From
-          this message we can find the related model and res_id,
-        - mass_mailing mode: active_model, active_id  = model and ID of a
-          document we are commenting,
-        """
         compose_mode = context.get('mail.compose.message.mode', 'comment')
         active_model = context.get('active_model')
         active_id = context.get('active_id')
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+
+        # get default values according to the composition mode
+        vals = {}
         if compose_mode in ['reply']:
             vals = self.get_message_data(cr, uid, int(context['active_id']), context=context)
         elif compose_mode in ['comment', 'mass_mail'] and active_model and active_id:
@@ -170,6 +169,7 @@ class mail_compose_message(osv.TransientModel):
             result.update({
                     'content_subtype' : 'plain', # default to the text version due to quoting
                     'body_text' : body,
+                    'body_html': body,
                     'subject' : subject,
                     'attachment_ids' : [],
                     'model' : message_data.model or False,
@@ -178,7 +178,6 @@ class mail_compose_message(osv.TransientModel):
                     'email_to' : message_data.reply_to or message_data.email_from or False,
                     'email_cc' : message_data.email_cc or False,
                     'user_id' : uid,
-
                     # pass msg-id and references of mail we're replying to, to construct the
                     # new ones later when sending
                     'message_id' :  message_data.message_id or False,
@@ -410,8 +409,7 @@ class mail_compose_message(osv.TransientModel):
         return template and EXPRESSION_PATTERN.sub(merge, template)
 
 
-
-class mail_compose_message_extended(osv.osv_memory):
+class mail_compose_message_extended(osv.TransientModel):
     """ Extension of 'mail.compose.message' to support default field values related
         to CRM-like models that follow the following conventions:
 
@@ -429,6 +427,7 @@ class mail_compose_message_extended(osv.osv_memory):
         """Overrides the default implementation to provide more default field values
            related to the corresponding CRM case.
         """
+        print 'get_value'
         result = super(mail_compose_message_extended, self).get_value(cr, uid,  model, res_id, context=context)
         model_obj = self.pool.get(model)
         if getattr(model_obj, '_mail_compose_message', False) and res_id:

From 78ce7b2165391e4223b8474235b49dd9ecfdf07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 17:33:16 +0200
Subject: [PATCH 203/397] [IMP] mail.compose.message: cleaned code and behavior
 of embedded composition form.

bzr revid: tde@openerp.com-20120710153316-dbj8d2kb6rynqu22
---
 addons/mail/wizard/mail_compose_message.py    | 242 ++++++------------
 .../mail/wizard/mail_compose_message_view.xml |   2 +-
 2 files changed, 79 insertions(+), 165 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 5031a8c5dea..1af99f409a3 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -118,74 +118,91 @@ class mail_compose_message(osv.TransientModel):
     }
 
     def get_value(self, cr, uid, model, res_id, context=None):
-        """Returns a defaults-like dict with initial values for the composition
-           wizard when sending an email related to the document record identified
-           by ``model`` and ``res_id``.
+        """ Returns a defaults-like dict with initial values for the composition
+            wizard when sending an email related to the document record
+            identified by ``model`` and ``res_id``.
 
-           The default implementation returns an empty dictionary, and is meant
-           to be overridden by subclasses.
+            The default implementation returns an empty dictionary, and is meant
+            to be overridden by subclasses.
 
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
+            :param str model: model name of the document record this mail is
+                related to.
+            :param int res_id: id of the document record this mail is related to.
+            :param dict context: several context values will modify the behavior
+                of the wizard, cfr. the class description.
         """
-        return {}
+        result = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        result.update({
+            'model': model,
+            'res_id': res_id,
+            'email_from': user.user_email or tools.config.get('email_from', False),
+            'body_html': '<br />---<br />' + tools.ustr(user.signature or ''),
+        })
+        return result
 
     def get_message_data(self, cr, uid, message_id, context=None):
-        """Returns a defaults-like dict with initial values for the composition
-           wizard when replying to the given message (e.g. including the quote
-           of the initial message, and the correct recipient).
-           Should not be called unless ``context['mail.compose.message.mode'] == 'reply'``.
+        """ Returns a defaults-like dict with initial values for the composition
+            wizard when replying to the given message (e.g. including the quote
+            of the initial message, and the correct recipient). It should not be
+            called unless ``context['mail.compose.message.mode'] == 'reply'``.
 
-           :param int message_id: id of the mail.message to which the user
-                                  is replying.
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-                                When calling this method, the ``'mail'`` value
-                                in the context should be ``'reply'``.
+            :param int message_id: id of the mail.message to which the user
+                is replying.
+            :param dict context: several context values will modify the behavior
+                of the wizard, cfr. the class description.
         """
         if context is None:
             context = {}
         result = {}
-        mail_message = self.pool.get('mail.message')
-        if message_id:
-            message_data = mail_message.browse(cr, uid, message_id, context)
-            subject = tools.ustr(message_data.subject or '')
-            # we use the plain text version of the original mail, by default,
-            # as it is easier to quote than the HTML version.
-            # XXX TODO: make it possible to switch to HTML on the fly
-            current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            body = message_data.body_text or current_user.signature or ''
-            if context.get('mail.compose.message.mode') == 'reply':
-                sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
-                sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
-                quoted_body = '> %s' % tools.ustr(body.replace('\n', "\n> ") or '')
-                body = '\n'.join(["\n", (sent_date + sender), quoted_body])
-                body += "\n" + (current_user.signature or '')
-                re_prefix = _("Re:")
-                if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
-                    subject = "%s %s" % (re_prefix, subject)
-            result.update({
-                    'content_subtype' : 'plain', # default to the text version due to quoting
-                    'body_text' : body,
-                    'body_html': body,
-                    'subject' : subject,
-                    'attachment_ids' : [],
-                    'model' : message_data.model or False,
-                    'res_id' : message_data.res_id or False,
-                    'email_from' : current_user.user_email or message_data.email_to or False,
-                    'email_to' : message_data.reply_to or message_data.email_from or False,
-                    'email_cc' : message_data.email_cc or False,
-                    'user_id' : uid,
-                    # pass msg-id and references of mail we're replying to, to construct the
-                    # new ones later when sending
-                    'message_id' :  message_data.message_id or False,
-                    'references' : message_data.references and tools.ustr(message_data.references) or False,
-                })
+        if not message_id:
+            return result
+
+        current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context)
+        # Form the subject
+        re_prefix = _("Re:")
+        reply_subject = tools.ustr(message_data.subject or '')
+        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
+            reply_subject = "%s %s" % (re_prefix, reply_subject)
+        # Form the bodies (text and html). We use the plain text version of the
+        # original mail, by default, as it is easier to quote than the HTML
+        # version. TODO: make it possible to switch to HTML on the fly
+        sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
+        sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
+        body_text = message_data.body_text or ''
+        quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
+        quoted_body_html = '> %s' % tools.ustr(body_text.replace('\n', "<br />&gt; ") or '')
+        reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
+        reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature)
+        # Update header and references
+        reply_headers = {}
+        reply_references = message_data.references and tools.ustr(message_data.references) or False
+        reply_message_id = message_data.message_id or False
+        if reply_message_id:
+            reply_references = (reply_references or '') + " " + mail_wiz.message_id
+            reply_headers['In-Reply-To'] = mail_wiz.message_id
+        # update the result
+        result.update({
+            'body_text': reply_body_text,
+            'body_html': quoted_body_html,
+            'subject': reply_subject,
+            'attachment_ids': [],
+            'model': message_data.model or False,
+            'res_id': message_data.res_id or False,
+            'email_from': current_user.user_email or message_data.email_to or False,
+            'email_to': message_data.reply_to or message_data.email_from or False,
+            'email_cc': message_data.email_cc or False,
+            'user_id': uid,
+            # pass msg-id and references of mail we're replying to, to construct the
+            # new ones later when sending
+            'message_id': reply_message_id,
+            'references': reply_references,
+            'headers': reply_headers,
+        })
         return result
 
-    def compose_message(self, cr, uid, ids, context=None):
+    def send_mail(self, cr, uid, ids, context=None):
         '''Process the wizard contents and proceed with sending the corresponding
            email(s), rendering any template patterns on the fly if needed.
            If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
@@ -197,8 +214,6 @@ class mail_compose_message(osv.TransientModel):
            :param dict context: several context values will modify the behavior
                                 of the wizard, cfr. the class description.
         '''
-        print 'compose_message'
-        print context
         if context is None:
             context = {}
         mail_message = self.pool.get('mail.message')
@@ -216,7 +231,8 @@ class mail_compose_message(osv.TransientModel):
             if formatting:
                 content_subtype = 'html'
             else:
-                content_subtype='text'
+                content_subtype = 'text'
+                subject = False
             if email_mode:
                 type = 'email'
             else:
@@ -242,11 +258,6 @@ class mail_compose_message(osv.TransientModel):
                 mail_thread_enabled = True
             else:
                 mail_thread_enabled = False
-            
-            # Reply Email
-            if context.get('mail.compose.message.mode') == 'reply' and mail_wiz.message_id:
-                references = (mail_wiz.references or '') + " " + mail_wiz.message_id
-                headers['In-Reply-To'] = mail_wiz.message_id
 
             if context.get('mail.compose.message.mode') == 'mass_mail':
                 # Mass mailing: must render the template patterns
@@ -274,14 +285,13 @@ class mail_compose_message(osv.TransientModel):
             else:
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
-                    print mail_wiz.body_html
                     msg_ids = active_model_pool.message_append(cr, uid, active_ids,
                             mail_wiz.subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=content_subtype, state='outgoing',
                             email_to=mail_wiz.email_to, email_from=mail_wiz.email_from, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
                             reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context,
                             type=type)
                 else:
-                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), mail_wiz.subject, body,
+                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), mail_wiz.subject, body_text,
                         model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id),
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
@@ -290,95 +300,6 @@ class mail_compose_message(osv.TransientModel):
 
         return {'type': 'ir.actions.act_window_close'}
 
-    def send_mail(self, cr, uid, ids, context=None):
-        '''Process the wizard contents and proceed with sending the corresponding
-           email(s), rendering any template patterns on the fly if needed.
-           If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
-           set to ``'mass_mail'``), the resulting email(s) are scheduled for being
-           sent the next time the mail.message scheduler runs, or the next time
-           ``mail.message.process_email_queue`` is called.
-           Otherwise the new message is sent immediately.
-
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        '''
-        print 'send_mail'
-        print context
-        if context is None:
-            context = {}
-        mail_message = self.pool.get('mail.message')
-        for mail in self.browse(cr, uid, ids, context=context):
-            attachment = {}
-            for attach in mail.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
-            references = None
-            headers = {}
-
-            body =  mail.body_html if mail.content_subtype == 'html' else mail.body_text
-
-            # Get model, and check whether it is OpenChatter enabled, aka inherit from mail.thread
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                if context.get('active_ids') and context.get('active_model'):
-                    active_ids = context['active_ids']
-                    active_model = context['active_model']
-                else:
-                    active_model = mail.model
-                    active_model_pool = self.pool.get(active_model)
-                    active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail.filter_id.domain), context=ast.literal_eval(mail.filter_id.context))
-            else:
-                active_model = mail.model
-                active_ids = [int(mail.res_id)]
-            active_model_pool = self.pool.get(active_model)
-            if hasattr(active_model_pool, '_inherit') and 'mail.thread' in active_model_pool._inherit:
-                mail_thread_enabled = True
-            else:
-                mail_thread_enabled = False
-            
-            # Reply Email
-            if context.get('mail.compose.message.mode') == 'reply' and mail.message_id:
-                references = (mail.references or '') + " " + mail.message_id
-                headers['In-Reply-To'] = mail.message_id
-
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # Mass mailing: must render the template patterns
-                for active_id in active_ids:
-                    subject = self.render_template(cr, uid, mail.subject, active_model, active_id)
-                    rendered_body = self.render_template(cr, uid, body, active_model, active_id)
-                    email_from = self.render_template(cr, uid, mail.email_from, active_model, active_id)
-                    email_to = self.render_template(cr, uid, mail.email_to, active_model, active_id)
-                    email_cc = self.render_template(cr, uid, mail.email_cc, active_model, active_id)
-                    email_bcc = self.render_template(cr, uid, mail.email_bcc, active_model, active_id)
-                    reply_to = self.render_template(cr, uid, mail.reply_to, active_model, active_id)
-    
-                    # in mass-mailing mode we only schedule the mail for sending, it will be 
-                    # processed as soon as the mail scheduler runs.
-                    if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id],
-                            subject, body_text=mail.body_text, body_html=mail.body_html, content_subtype=mail.content_subtype, state='outgoing',
-                            email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
-                            reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                    else:
-                        mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
-                            model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
-                            attachments=attachment, references=references, res_id=active_id,
-                            content_subtype=mail.content_subtype, headers=headers, context=context)
-            else:
-                # normal mode - no mass-mailing
-                if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids,
-                            mail.subject, body_text=mail.body_text, body_html=mail.body_html, content_subtype=mail.content_subtype, state='outgoing',
-                            email_to=mail.email_to, email_from=mail.email_from, email_cc=mail.email_cc, email_bcc=mail.email_bcc,
-                            reply_to=mail.reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                else:
-                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail.email_from, to_email(mail.email_to), mail.subject, body,
-                        model=mail.model, email_cc=to_email(mail.email_cc), email_bcc=to_email(mail.email_bcc), reply_to=mail.reply_to,
-                        attachments=attachment, references=references, res_id=int(mail.res_id),
-                        content_subtype=mail.content_subtype, headers=headers, context=context)]
-                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                mail_message.send(cr, uid, msg_ids, context=context)
-
-        return {'type': 'ir.actions.act_window_close'}
-
     def render_template(self, cr, uid, template, model, res_id, context=None):
         """Render the given template text, replace mako-like expressions ``${expr}``
            with the result of evaluating these expressions with an evaluation context
@@ -424,24 +345,17 @@ class mail_compose_message_extended(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, res_id, context=None):
-        """Overrides the default implementation to provide more default field values
-           related to the corresponding CRM case.
+        """ Overrides the default implementation to provide more default field values
+            related to the corresponding CRM case.
         """
-        print 'get_value'
         result = super(mail_compose_message_extended, self).get_value(cr, uid,  model, res_id, context=context)
         model_obj = self.pool.get(model)
         if getattr(model_obj, '_mail_compose_message', False) and res_id:
             data = model_obj.browse(cr, uid , res_id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             result.update({
-                'model': model,
-                'res_id': res_id,
-                'email_from': user.user_email or tools.config.get('email_from', False),
                 'email_to': data.email_from or False,
                 'email_cc': tools.ustr(data.email_cc or ''),
                 'subject': data.name or False,
-                'body_text': '\n' + tools.ustr(user.signature or ''),
-                'subtype': 'plain',
             })
             if hasattr(data, 'section_id'):
                 result['reply_to'] = data.section_id and data.section_id.reply_to or False
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 5a3711c10f3..86a9bd87c00 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -53,7 +53,7 @@
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
                         <field name="dest_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
-                        <button icon="gtk-ok" name="compose_message" string="Post" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
                         <a href="#" class="oe_mail_compose_message_email">Send an email</a>
                         <div class='oe_mail_compose_message_icons'>
                             <a href="#" class="oe_mail_compose_message_checklist">

From 059fc3011626c1dfbc6cb4612062eaf4ca1d244f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 17:34:09 +0200
Subject: [PATCH 204/397] [FIX] mail.js: fixed instance -> session.

bzr revid: tde@openerp.com-20120710153409-0hjtro91nycxcu4g
---
 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 3da70a4f1f1..e9fca4958f7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -769,7 +769,7 @@ openerp.mail = function(session) {
             var self = this;
             this.reinit();
             if (! this.view.datarecord.id ||
-                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$element.find('.oe_mail_thread').hide();
                 return;
             }

From d43db51a02806d175079ce63b755502c05c50db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 17:34:21 +0200
Subject: [PATCH 205/397] [IMP] mail.message: cleaned form view.

bzr revid: tde@openerp.com-20120710153421-0g559ne09emvj209
---
 addons/mail/mail_message_view.xml | 69 ++++++++++++++-----------------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index c70b4a4bc7e..ee67098110e 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -111,23 +111,26 @@
                 <form string="Email message" version="7.0">
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
-                        <h1><field name="subject"/></h1>
-						<label for="user_id"/>
-                        <h2><field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/></h2>
-                        <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                        <h2><field name="subject"/></h2>
+						<div>
+                            by <field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                 context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                        </div>
                         <notebook colspan="4">
                             <page string="Message Details">
-                                <group string="Recipients">
-                                    <field name="email_from"/>
-                                    <field name="email_to"/>
-                                    <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                    <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
-                                    <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
-                                </group>
-                                <group string="Partner information">
-                                    <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                                    <field name="partner_ids" readonly="1" WIDGET="many2many_tags"/>
+                                <group>
+                                    <group>
+                                        <field name="email_from"/>
+                                        <field name="email_to"/>
+                                        <field name="email_cc"/>
+                                        <field name="email_bcc"/>
+                                        <field name="reply_to"/>
+                                    </group>
+                                    <group>
+                                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                                        <field name="partner_ids" readonly="1" WIDGET="many2many_tags"/>
+                                    </group>
                                 </group>
                                 <notebook>
                                     <page string="Body (Rich)">
@@ -138,38 +141,30 @@
                                     </page>
                                 </notebook>
                             </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
                             <page string="Advanced" groups="base.group_no_one">
                                 <group>
-                                    <group string="Type details">
+                                    <group>
                                         <field name="auto_delete"/>
                                         <field name="type"/>
                                         <field name="content_subtype"/>
                                         <field name="state" colspan="2"/>
-                                        <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
-                                        <field name="original" attrs="{'invisible':[('original', '=', False)]}"/>
-                                    </group>
-                                    <group string="Headers">
-                                        <field name="message_id"/>
-<!--
-                                        <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
--->
-                                        <field name="references"/>
-<!--
-                                        <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
--->
-                                        <field name="headers" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                    </group>
-                                </group>
-                                <group string="Message Details">
-                                    <field name="model"/>
-                                    <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
+                                        <field name="mail_server_id"/>
+                                        <field name="original"/>
+                                        <field name="model"/>
+                                        <field name="res_id"/>
+                                        <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
                                             attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
-                                    <field name="res_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="message_id"/>
+                                        <field name="references"/>
+                                        <field name="headers"/>
+                                    </group>
                                 </group>
                             </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
                         </notebook>
                     </sheet>
                 </form>

From 58677aa2dffc263d7d8993789fa1e3a77f3ec57b Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 11 Jul 2012 10:33:09 +0530
Subject: [PATCH 206/397] [IMP]crm: remove duration label

bzr revid: kjo@tinyerp.com-20120711050309-n3tvgy4196q7wdsk
---
 addons/crm/crm_meeting_view.xml | 301 ++++++++++++++++----------------
 1 file changed, 147 insertions(+), 154 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 79ed5a3adb2..aef7b411ae9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -91,162 +91,155 @@
                             <label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
                         </h2>
                     </group>
-                    <group>
-                        <h2>
-                            <label for="duration" string="Duration" />
-                            
-                        </h2>
-                    </group>
-                <group colspan="4" col="4">
-                    <group colspan="2">
-                        <field name="user_id" />
-                        <field name="section_id" widget="selection"/>
-                        <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="email_from"/>
-                    </group>
-                    <group> 
-                        <field name="date_deadline" 
-                                string="End Date" required="1"
-                                on_change="onchange_dates(date,False,date_deadline)"/>
-                        <field name="duration" widget="float_time"
-                                on_change="onchange_dates(date,duration,False,allday)"/>
-                        <field name="alarm_id" string="Reminder" widget="selection" />
-                        <field name="class" string="Privacy"/>
-                        <field name="show_as"/>
-                        <field name="categ_id" widget="selection"
-                            string="Meeting Type"
-                            domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="rrule" invisible="1" readonly="1"/>
-                        <field name="recurrent_id" invisible="1"/>
-                        <field name="recurrent_uid" invisible="1"/>
-                    </group>
-                    <group colspan="2">
-                    </group>
-                </group>
-                <notebook>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree">
-                            <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
-                                <field name="email" string="Mail To"/>
-                                <field name="role" />
-                                <field name="state" />
-                                <button name="do_tentative"
-                                    states="needs-action,declined,accepted"
-                                    string="Uncertain" type="object"
-                                    icon="terp-crm" />
-                                <button name="do_accept" string="Accept"
-                                    states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
-                                <button name="do_decline" string="Decline"
-                                    states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                            </tree>
-                            <form string="Invitation details" version="7.0">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="email" />
-                                        <field name="rsvp" />
-                                        <field name="cutype" />
-                                        <field name="role" />
-                                        <separator colspan="4" string="" />
-                                        <group col="6" colspan="4">
-                                            <field name="state" />
-                                            <button name="do_tentative"
-                                                states="needs-action,declined,accepted"
-                                                string="Uncertain"
-                                                type="object"
-                                                icon="terp-crm" />
-                                            <button name="do_accept"
-                                                string="Accept"
-                                                states="needs-action,tentative,declined"
-                                                type="object"
-                                                icon="gtk-apply" />
-                                            <button name="do_decline"
-                                                string="Decline"
-                                                states="needs-action,tentative,accepted"
-                                                type="object"
-                                                icon="gtk-cancel" />
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                        </group>
-                                    </page>
-                                    <page string="Other">
-                                        <field name="user_id"/>
-                                        <newline />
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string=" Recurrence Pattern" />
-                                <field name="interval" />
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
-                                <newline />
-
-
-                            </group>
-                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
-                                <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
-                            </group>
-                            <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
-                                <group col="2" colspan="1">
-                                    <field name="select1" />
-                                </group>
-                                <group col="2" colspan="1">
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="3" colspan="1">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </group>
-                            </group>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="user_id" />
+                            <field name="section_id" widget="selection"/>
+                            <field name="partner_id" string="Partner"                            on_change="onchange_partner_id(partner_id)" />
+                            <field name="email_from"/>
                         </group>
+                        <group> 
+                            <field name="date_deadline" 
+                                    string="End Date" required="1"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            <field name="duration" widget="float_time"
+                                    on_change="onchange_dates(date,duration,False,allday)"/>
+                            <field name="alarm_id" string="Reminder" widget="selection" />
+                            <field name="class" string="Privacy"/>
+                            <field name="show_as"/>
+                            <field name="categ_id" widget="selection"
+                                string="Meeting Type"
+                                domain="[('object_id.model', '=', 'crm.meeting')]" />
+                            <field name="rrule" invisible="1" readonly="1"/>
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
+                        </group>
+                        <group colspan="2">
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" colspan="4"
+                                nolabel="1" widget="one2many" mode="tree">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="sent_by_uid" string="From"/>
+                                    <field name="user_id" string="To"/>
+                                    <field name="email" string="Mail To"/>
+                                    <field name="role" />
+                                    <field name="state" />
+                                    <button name="do_tentative"
+                                        states="needs-action,declined,accepted"
+                                        string="Uncertain" type="object"
+                                        icon="terp-crm" />
+                                    <button name="do_accept" string="Accept"
+                                        states="needs-action,tentative,declined"
+                                        type="object" icon="gtk-apply" />
+                                    <button name="do_decline" string="Decline"
+                                        states="needs-action,tentative,accepted"
+                                        type="object" icon="gtk-cancel" />
+                                    <button
+                                        name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                        string="Delegate" type="action"
+                                        icon="gtk-sort-descending"
+                                        states="needs-action,tentative,declined,accepted"
+                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                </tree>
+                                <form string="Invitation details" version="7.0">
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="email" />
+                                            <field name="rsvp" />
+                                            <field name="cutype" />
+                                            <field name="role" />
+                                            <separator colspan="4" string="" />
+                                            <group col="6" colspan="4">
+                                                <field name="state" />
+                                                <button name="do_tentative"
+                                                    states="needs-action,declined,accepted"
+                                                    string="Uncertain"
+                                                    type="object"
+                                                    icon="terp-crm" />
+                                                <button name="do_accept"
+                                                    string="Accept"
+                                                    states="needs-action,tentative,declined"
+                                                    type="object"
+                                                    icon="gtk-apply" />
+                                                <button name="do_decline"
+                                                    string="Decline"
+                                                    states="needs-action,tentative,accepted"
+                                                    type="object"
+                                                    icon="gtk-cancel" />
+                                                <button
+                                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                    string="Delegate"
+                                                    type="action"
+                                                    icon="gtk-sort-descending"
+                                                    states="needs-action,tentative,declined,accepted"
+                                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                            </group>
+                                        </page>
+                                        <page string="Other">
+                                            <field name="user_id"/>
+                                            <newline />
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
+                            <group col="4" colspan="4" name="rrule">
+                                <group col="4" colspan="4">
+                                    <field name="rrule_type" string=" Recurrence Pattern" />
+                                    <field name="interval" />
+                                    <field name="end_type" />
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                    <label string=" " colspan="2" />
+                                    <newline />
+                                    <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                    <newline />
 
-                    </page>
-                </notebook>
+
+                                </group>
+                                <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                    <separator string="Choose day where repeat the meeting" colspan="8"/>
+                                    <field name="mo" colspan="1" />
+                                    <field name="tu" colspan="1" />
+                                    <field name="we" colspan="1" />
+                                    <field name="th" colspan="1" />
+                                    <newline/>
+                                    <field name="fr" colspan="1" />
+                                    <field name="sa" colspan="1"  />
+                                    <field name="su" colspan="1"  />
+                                    <newline />
+                                </group>
+                                <group col="10" colspan="4"
+                                    attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                    <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
+                                    <group col="2" colspan="1">
+                                        <field name="select1" />
+                                    </group>
+                                    <group col="2" colspan="1">
+                                        <field name="day"
+                                            attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                                'invisible' : [('select1','=','day')]}" />
+                                    </group>
+                                    <group col="3" colspan="1">
+                                        <field name="byday" string="The"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                        <field name="week_list" nolabel="1"
+                                            attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
                 </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>

From 204f325952a2f360fb1f04b804993c6c484e3f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 09:55:57 +0200
Subject: [PATCH 207/397] [FIX] crm_lead: yml test: as crm_add_note has been
 removed, change a test from add_note to message_append_note.

bzr revid: tde@openerp.com-20120711075557-w5jnzq7l5ou3q6sa
---
 addons/crm/test/process/lead2opportunity2win.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c1caf394c2e..c517d6af6ba 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -54,10 +54,8 @@
 -
   After communicated  with customer, I put some notes with contract details.
 -
-  !python {model: crm.add.note}: |
-    context.update({'active_model': 'crm.lead', 'active_id': ref('crm_case_qrecorp0')})
-    note_id = self.create(cr, uid, {'body': "ces détails envoyés par le client sur ​​le FAX pour la qualité"})
-    self.action_add(cr, uid, [note_id], context=context)
+  !python {model: crm.lead}: |
+    self.message_append_note(cr, uid, [ref('crm_case_qrecorp0')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -

From 5c8c8a5aaaff44e0de442aa2e884f0824f5a09f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 10:08:02 +0200
Subject: [PATCH 208/397] [REM] Removed a THIS file that had nothing to do
 here; removed temporary data for debug.

bzr revid: tde@openerp.com-20120711080802-2eakl0qztyxowa9x
---
 .../crm/wizard/mail_compose_message.py.THIS   | 63 -------------------
 addons/hr_recruitment/hr_recruitment_data.xml | 25 --------
 2 files changed, 88 deletions(-)
 delete mode 100644 addons/crm/wizard/mail_compose_message.py.THIS

diff --git a/addons/crm/wizard/mail_compose_message.py.THIS b/addons/crm/wizard/mail_compose_message.py.THIS
deleted file mode 100644
index 11d340b2f76..00000000000
--- a/addons/crm/wizard/mail_compose_message.py.THIS
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-import tools
-
-SUPPORTED_MODELS = ['crm.lead',]
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        """Returns a defaults-like dict with initial values for the composition
-           wizard when sending an email related to the document record identified
-           by ``model`` and ``res_id``.
-
-           Overrides the default implementation to provide more default field values
-           related to the corresponding CRM case.
-
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        """
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, res_id, context=context)
-        if model in SUPPORTED_MODELS and res_id:
-            model_obj = self.pool.get(model)
-            data = model_obj.browse(cr, uid , res_id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result.update({
-                    'subject' : data.name or False,
-                    'email_to' : data.email_from or False,
-                    'email_from' : user.user_email or tools.config.get('email_from', False),
-                    'body_text' : '\n' + tools.ustr(user.signature or ''),
-                    'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model,
-                    'res_id': res_id,
-                    'content_subtype': 'plain',
-                })
-            if hasattr(data, 'section_id'):
-                result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 0b73d1a173f..6b64964eb2a 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -1,31 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<!--
 <data noupdate="1">
--->
-<data>
-
-        <record id="outgoing_test" model="ir.mail_server">
-            <field name="smtp_host">smtp.openerp.com</field>
-            <field name="name">smtp.openerp.com</field>
-            <field name="smtp_encryption">starttls</field>
-            <field name="smtp_port">2525</field>
-            <field name="smtp_user">tde</field>
-            <field name="sequence">9</field>
-        </record>
-
-
-        <record id="fetchmail_hr_applicant_test" model="fetchmail.server">
-            <field name="object_id" ref="hr_recruitment.model_hr_applicant"/>
-            <field name="attach" eval="True"/>
-            <field name="original" eval="False"/>
-            <field name="server">imap.openerp.com</field>
-            <field name="name">imap.openerp.com</field>
-            <field name="user">tde</field>
-            <field name="is_ssl">True</field>
-            <field name="port">993</field>
-            <field name="type">imap</field>
-        </record>
 
     <!-- Meeting Types (for interview meetings) -->
     <record model="crm.meeting.type" id="categ_meet_interview">

From 9d20e26da898f47ff0c57cd256307795782e808f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:38:48 +0200
Subject: [PATCH 209/397] [IMP] mail-Chatter: cleaned xml for side menu.

bzr revid: tde@openerp.com-20120711093848-wqrq3cc1x26t66ti
---
 addons/mail/static/src/xml/mail.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d3b803ecd5d..57545b478df 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -127,20 +127,15 @@
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="display['show_delete']">
-<!--
-                            <t t-if="thread._is_author(record.user_id[0])">
--->
-                            <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-<!--
-                            </t>
--->
+                                <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <t t-if="display['show_hide']">
-                            <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                            <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
-                        </t>
-                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Repzefly</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                        <li t-if="display['show_hide']">
+                            <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
+                        </li>
+                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                        <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->

From 340ca269e4d88450e7d7ecf9313d3a876b18f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:54:22 +0200
Subject: [PATCH 210/397] [IMP] mail: chatter: reply by email not present in
 Wall.

bzr revid: tde@openerp.com-20120711095422-3ou9j0lfvxz9owdy
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 57545b478df..7e88e1e5bc7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -133,7 +133,7 @@
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
-                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>

From e9b6a1d2fafff4b0dbe8c5ce6faf77a5097b69a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:55:45 +0200
Subject: [PATCH 211/397] [IMP] mail: chatter: js: fixed delete only for
 author; removed dead code (removed classes/links); dataset -> datasetsearch.

bzr revid: tde@openerp.com-20120711095545-2fhr16re89s88l06
---
 addons/mail/static/src/css/mail.css |  2 +-
 addons/mail/static/src/js/mail.js   | 96 +++++++++++++----------------
 2 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d1cc9a92416..5695eb9ffc4 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -148,7 +148,7 @@
 /* ------------------------------------------------------------ */
 
 .openerp div.oe_mail_thread_action {
-	/*display: none;*/
+    display: none;
     white-space: normal;
     padding: 8px;
     background: #eee;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e9fca4958f7..54bb5a9701f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -56,8 +56,8 @@ openerp.mail = function(session) {
         },
 
         /** checks if tue current user is the message author */
-        _is_author: function (message_user_id) {
-            return (this.session.uid == message_user_id);
+        is_author: function (widget, message_user_id) {
+            return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
 
         /**
@@ -264,7 +264,6 @@ openerp.mail = function(session) {
          */
         init: function(parent, params) {
             this._super(parent);
-            console.log(parent);
             // options
             this.params = params || {};
             this.params.email_mode = params.email_mode || false;
@@ -276,8 +275,11 @@ openerp.mail = function(session) {
                 this.params.active_id = this.params.res_id;
             }
             // create a context for the default_get of the compose form
-            var context = {'active_model': this.params.res_model, 'active_id': this.params.active_id,
-                'mail.compose.message.mode': this.params.mode};
+            var context = {
+                'active_model': this.params.res_model,
+                'active_id': this.params.active_id,
+                'mail.compose.message.mode': this.params.mode,
+            };
             // create a form_view on the mail.compose.message wizard
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             this.form_view = new session.web.FormView(this, this.ds_compose, false, {
@@ -298,6 +300,7 @@ openerp.mail = function(session) {
                 this.session.session_id, 'res.users', 'avatar', this.session.uid);
             this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$element.find('div.oe_mail_msg_content').empty();
+            // add the form, bind events, activate the form
             var msg_node = this.$element.find('div.oe_mail_msg_content');
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
@@ -387,12 +390,14 @@ openerp.mail = function(session) {
          * @param {Number} [params.res_id] res_id of record [REQUIRED]
          * @param {Number} [params.uid] user id [REQUIRED]
          * @param {Bool}   [params.parent_id=false] parent_id of message
-         * @param {Number} [params.thread_level=0] number of levels in the thread (only 0 or 1 currently)
-         * @param {Bool}   [params.wall=false] thread is displayed in the wall
-         * @param {Number} [params.msg_more_limit=150] number of character to display before having a "show more" link;
-         *                                             note that the text will not be truncated if it does not have 110% of
-         *                                             the parameter (ex: 110 characters needed to be truncated and be displayed
-         *                                             as a 100-characters message)
+         * @param {Number} [params.thread_level=0] number of levels in the thread
+         *      (only 0 or 1 currently)
+         * @param {Bool}   [params.is_wall=false] thread is displayed in the wall
+         * @param {Number} [params.msg_more_limit=150] number of character to
+         *      display before having a "show more" link; note that the text
+         *      will not be truncated if it does not have 110% of the parameter
+         *      (ex: 110 characters needed to be truncated and be displayed as
+         *      a 100-characters message)
          * @param {Number} [params.limit=100] maximum number of messages to fetch
          * @param {Number} [params.offset=0] offset for fetching messages
          * @param {Number} [params.records=null] records to show instead of fetching messages
@@ -403,21 +408,20 @@ openerp.mail = function(session) {
             this.params = params;
             this.params.parent_id = this.params.parent_id || false;
             this.params.thread_level = this.params.thread_level || 0;
-            this.params.is_wall = this.params.is_wall || this.params.records || false;
+            this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
             this.params.msg_more_limit = this.params.msg_more_limit || 150;
             this.params.limit = this.params.limit || 100;
             this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
             // datasets and internal vars
-            this.ds = new session.web.DataSet(this, this.params.res_model);
-            this.ds_users = new session.web.DataSet(this, 'res.users');
-            this.ds_msg = new session.web.DataSet(this, 'mail.message');
+            this.ds = new session.web.DataSetSearch(this, this.params.res_model);
+            this.ds_users = new session.web.DataSetSearch(this, 'res.users');
+            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             // display customization vars
             this.display = {};
             this.display.show_post_comment = this.params.show_post_comment || false;
-            this.display.show_msg_menu = this.params.is_wall;
             this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
             this.display.show_delete = ! this.params.is_wall;
             this.display.show_hide = this.params.is_wall;
@@ -427,12 +431,6 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-
-            // // customize display
-            // if (! this.display.show_post_comment) {
-            //     this.$element.find('div.oe_mail_thread_action').hide();
-            // }
-
             // add events
             this.add_events();
             // display user, fetch comments
@@ -442,7 +440,9 @@ openerp.mail = function(session) {
             // customize display
             $.when(display_done).then(this.proxy('do_customize_display'));            
             // add message composition form view
-            var compose_done = this.instantiate_composition_form();
+            if (this.display.show_post_comment) {
+                var compose_done = this.instantiate_composition_form();
+            }
             return display_done && compose_done;
         },
 
@@ -461,8 +461,6 @@ openerp.mail = function(session) {
 
         do_customize_display: function() {
             if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
-            if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
-            if (! this.display.show_msg_menu) { this.$element.find('img.oe_mail_msg_menu_icon').hide(); }
         },
         
         add_events: function() {
@@ -473,19 +471,19 @@ openerp.mail = function(session) {
             this.$element.find('button.oe_mail_button_more').click(function () {
                 self.do_more();
             });
-            // event: writing in textarea
-            this.$element.find('textarea.oe_mail_action_textarea').keyup(function (event) {
+            // event: writing in basic textarea of composition form (quick reply)
+            this.$element.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
                 if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
                 else if (charCode == 13) { return self.do_comment(); }
             });
-            // event: click on 'reply' in msg
+            // event: click on 'Reply' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
                 var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
                 event.preventDefault();
             });
-            // event: click on 'delete' in msg
+            // event: click on 'Delete' in msg side menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
@@ -495,9 +493,10 @@ openerp.mail = function(session) {
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
-                return false;
+                event.preventDefault();
+                return call_defer;
             });
-            // event: click on 'hide' in msg
+            // event: click on 'Hide' in msg side menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
                 if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
                 var msg_id = event.srcElement.dataset.id;
@@ -507,43 +506,34 @@ openerp.mail = function(session) {
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
-                return false;
-            });
-            // event: click on "reply by email" in msg
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
-                var msg_id = event.srcElement.dataset.msg_id;
-                console.log(msg_id)
-                if (! msg_id) return false;
-                // var parent_node = $(event.srcElement).parents('div.oe_mail_msg_content').eq(0);
-                // var text_content = $(parent_node).find('div.oe_mail_msg_record_body').eq(0).html();
-                // self.compose_message.set_body_value(text_content, text_content);
                 event.preventDefault();
-                self.instantiate_composition_form('reply', msg_id);
+                return call_defer;
             });
-            // event: click on 'hide this type' in wheel_menu
+            // event: click on 'Hide this type' in the side menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
                 if (! confirm(_t("Do you really want to hide this type of thread ?"))) { return false; }
                 var subtype = event.srcElement.dataset.subtype;
                 if (! subtype) return false;
-                console.log(subtype);
                 var call_defer = self.ds.call('message_subscription_hide', [[self.params.res_id], subtype]);
                 $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
                     $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
                 }
-                return false;
+                event.preventDefault();
+                return call_defer;
+            });
+            // event: click on "reply by email" in msg side menu
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
+                var msg_id = event.srcElement.dataset.msg_id;
+                if (! msg_id) return false;
+                self.instantiate_composition_form('reply', msg_id);
+                event.preventDefault();
             });
             // event: click on 'attachment(s)' in msg
             this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
                 var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
                 act_dom.toggle();
-                return false;
-            });
-            // see more
-            this.$element.on('click','a.oe_mail_msg_more', function (event) {
-                $(this).siblings('.oe_mail_msg_tail').show();
-                $(this).hide();
-                return false;
+                event.preventDefault();
             });
         },
         
@@ -645,6 +635,8 @@ openerp.mail = function(session) {
             record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
+            // is the user the author ?
+            record.is_author = mail.ChatterUtils.is_author(this, record.user_id[0]);
             // render
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
             $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));

From 7ba80c40a09295154c6123c0e23ee3ad326579fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:56:12 +0200
Subject: [PATCH 212/397] [IMP] cleditor: use cleditor instead of cleditor.min.

bzr revid: tde@openerp.com-20120711095612-a6e2yo0t4dqwf62a
---
 addons/web/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index b4e52eee81d..42798c9a523 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -33,7 +33,7 @@
         "static/lib/underscore/underscore.js",
         "static/lib/underscore/underscore.string.js",
         "static/lib/backbone/backbone.js",
-        "static/lib/cleditor/jquery.cleditor.min.js",
+        "static/lib/cleditor/jquery.cleditor.js",
         "static/lib/py.js/lib/py.js",
         "static/src/js/boot.js",
         "static/src/js/corelib.js",

From 4f5537541ffa43d120cff470d39382cf943655fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 12:46:50 +0200
Subject: [PATCH 213/397] [FIX] Unfollow: fixed method, not allowing to
 unsubscribe because of checking on 'mail.thread' instead of the real model
 name.

bzr revid: tde@openerp.com-20120711104650-9mg3kbq603sz0h5a
---
 addons/mail/mail_thread.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 532cc8b3982..d24ab8e3f2c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -919,13 +919,12 @@ class mail_thread(osv.Model):
         # Trying to unsubscribe somebody not in subscribers: returns False
         # if special management is needed; allows to know that an automatically
         # subscribed user tries to unsubscribe and allows to warn him
-        mail_thread_model = self.pool.get('mail.thread')
-        if not user_ids and not uid in mail_thread_model.message_get_subscribers(cr, uid, ids, context=context):
-            return False
-        subscription_obj = self.pool.get('mail.subscription')
         to_unsubscribe_uids = [uid] if user_ids is None else user_ids
+        subscription_obj = self.pool.get('mail.subscription')
         to_delete_sub_ids = subscription_obj.search(cr, uid,
                         ['&', '&', ('res_model', '=', self._name), ('res_id', 'in', ids), ('user_id', 'in', to_unsubscribe_uids)], context=context)
+        if not to_delete_sub_ids:
+            return False
         return subscription_obj.unlink(cr, uid, to_delete_sub_ids, context=context)
 
     def message_subscription_hide(self, cr, uid, ids, subtype=None, context=None):

From 537aa86ee2017f53cbddfa0cc2e4ab99ba816d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 13:17:22 +0200
Subject: [PATCH 214/397] [IMP] mail: chatter js: added Debug data link, that
 toggles a div with some info about the message.

bzr revid: tde@openerp.com-20120711111722-lv0lo01ojwgw4at8
---
 addons/mail/static/src/css/mail.css | 11 +++++++++++
 addons/mail/static/src/js/mail.js   | 28 +++++++++++++++++++---------
 addons/mail/static/src/xml/mail.xml | 15 +++++++++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 5695eb9ffc4..874a0e87a11 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -268,6 +268,17 @@
     clip: rect(5px, 40px, 45px, 0px);
 }
 
+.openerp .oe_mail_invisible {
+    display: none;
+}
+
+.openerp ul.oe_mail_debug {
+    color: #888;
+}
+
+.openerp ul.oe_mail_debug li {
+    margin-right: 12px;
+}
 
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 54bb5a9701f..21fcf650b62 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -134,7 +134,7 @@ openerp.mail = function(session) {
 
         /** Removes html tags, except b, em, br, ul, li */
         do_text_remove_html_tags: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li)\\s*&gt;', 'gi'), '<$1$2>');
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li|div)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
         },
         
@@ -432,7 +432,7 @@ openerp.mail = function(session) {
         start: function() {
             this._super.apply(this, arguments);
             // add events
-            this.add_events();
+            this.bind_events();
             // display user, fetch comments
             this.display_current_user();
             if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
@@ -462,8 +462,12 @@ openerp.mail = function(session) {
         do_customize_display: function() {
             if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
         },
-        
-        add_events: function() {
+
+
+        /**
+         * Bind events in the widget. Each event is slightly described
+         * in the function. */
+        bind_events: function() {
             var self = this;
             // generic events from Chatter Mixin
             mail.ChatterUtils.do_bind_chatter_events(this);
@@ -483,6 +487,12 @@ openerp.mail = function(session) {
                 act_dom.toggle();
                 event.preventDefault();
             });
+            // event: click on 'attachment(s)' in msg
+            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
+                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
+                act_dom.toggle();
+                event.preventDefault();
+            });
             // event: click on 'Delete' in msg side menu
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
                 if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
@@ -522,17 +532,17 @@ openerp.mail = function(session) {
                 event.preventDefault();
                 return call_defer;
             });
-            // event: click on "reply by email" in msg side menu
+            // event: click on "Reply" in msg side menu (email style)
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
                 var msg_id = event.srcElement.dataset.msg_id;
                 if (! msg_id) return false;
                 self.instantiate_composition_form('reply', msg_id);
                 event.preventDefault();
             });
-            // event: click on 'attachment(s)' in msg
-            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
-                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
-                act_dom.toggle();
+            // event: click on "Debug data" in msg side menu (email style)
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_debug', 'click', function (event) {
+                var act_dom = $(event.srcElement).parents('div.oe_mail_msg_content').find('ul.oe_mail_debug');
+                act_dom.toggleClass('oe_mail_invisible');
                 event.preventDefault();
             });
         },
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e88e1e5bc7..4f077d0bc31 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -146,6 +146,21 @@
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
                         <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
+                    <ul class="oe_mail_invisible oe_mail_debug">
+                        <li>document: (<t t-raw="record.model"/>,<t t-raw="record.res_id"/>)</li>
+                        <li>id: <t t-raw="record.id"/></li>
+                        <li>type: <t t-raw="record.type"/></li>
+                        <li>content_subtype: <t t-raw="record.content_subtype"/></li>
+                        <li>parent_id: <t t-raw="record.parent_id"/></li>
+                        <li>email_from: <t t-raw="record.email_from"/></li>
+                        <li>email_to: <t t-raw="record.email_to"/></li>
+                        <li>email_cc: <t t-raw="record.email_cc"/></li>
+                        <li>email_bcc: <t t-raw="record.email_bcc"/></li>
+                        <li>reply_to: <t t-raw="record.reply_to"/></li>
+                        <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
+                        <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
+                    </ul>
+                    <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
                         <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
                         <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>

From 08b3e0cc9ae02cb1941bd10a80682ed5c5d6a48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 14:36:13 +0200
Subject: [PATCH 215/397] [FIX] mail_thread: fixed a forgotten 'domain'
 attribute on message_read.

bzr revid: tde@openerp.com-20120711123613-ns9nag3vvwer7fdx
---
 addons/mail/mail_thread.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d24ab8e3f2c..0bebbf8d1e2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -447,8 +447,7 @@ class mail_thread(osv.Model):
         return ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
 
     def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False,
-                        get_ids=False, context=None):
+                        limit=100, offset=0, domain=None, count=False, context=None):
         """ OpenChatter feature: return thread messages ids according to the
             search domain given by ``message_search_get_domain``.
             
@@ -485,7 +484,7 @@ class mail_thread(osv.Model):
         return message_res
 
     def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, context=None):
+                        limit=100, offset=0, domain=None, context=None):
         """ OpenChatter feature: read the messages related to some threads.
             This method is used mainly the Chatter widget, to directly have
             read result instead of searching then reading.
@@ -493,7 +492,7 @@ class mail_thread(osv.Model):
             Please see message_search for more information about the parameters.
         """
         message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
-            limit, offset, context=context)
+            limit, offset, domain, context=context)
         messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
         
         """ Retrieve all attachments names """
@@ -846,7 +845,7 @@ class mail_thread(osv.Model):
 
     def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
                             type='notification', content_subtype='html', subtype=None, context=None):
-        if type in ['notification', 'reply']:
+        if type in ['notification', 'comment']:
             subject = None
         if content_subtype == 'html':
             body_html = body

From cac7de515de50da705a3f06f7cd3859066c5d704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 14:37:13 +0200
Subject: [PATCH 216/397] [IMP] mail: chatter: in side-menu, details entry
 points to the message form.

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 4f077d0bc31..dac6f467b00 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -134,7 +134,7 @@
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
                         <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
-                        <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>

From 11b452ed00e5b73160b6868569fffdc9d89687fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 15:14:04 +0200
Subject: [PATCH 217/397] [FIX] mail compose message: fixed mail thread enabled
 check.

bzr revid: tde@openerp.com-20120711131404-nythwj4gi3gvk66a
---
 addons/mail/wizard/mail_compose_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 1af99f409a3..1faf26cc8a7 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -254,7 +254,7 @@ class mail_compose_message(osv.TransientModel):
                 active_model = mail_wiz.model
                 active_ids = [int(mail_wiz.res_id)]
             active_model_pool = self.pool.get(active_model)
-            if hasattr(active_model_pool, '_inherit') and 'mail.thread' in active_model_pool._inherit:
+            if hasattr(active_model_pool, 'message_append'):
                 mail_thread_enabled = True
             else:
                 mail_thread_enabled = False

From 087f19220f9e29057c352a7240eef9768a8c4c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 15:14:30 +0200
Subject: [PATCH 218/397] [IMP] mail: Wall: composition form is now a
 mail.compose.message form view, as for Chatter.

bzr revid: tde@openerp.com-20120711131430-1j6zb6vnp0z8jkz8
---
 addons/mail/static/src/js/mail.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 21fcf650b62..0d91d7176ea 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -876,15 +876,30 @@ openerp.mail = function(session) {
             this.add_event_handlers();
             // load mail.message search view
             var search_view_ready = this.load_search_view(this.params.search_view_id, {}, false);
+            // load composition form
+            var compose_done = this.instantiate_composition_form();
             // fetch first threads
             var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
-            return (search_view_ready && comments_ready);
+            return (search_view_ready && comments_ready && compose_done);
         },
         
         stop: function () {
             this._super.apply(this, arguments);
         },
-        
+
+        instantiate_composition_form: function(mode, msg_id) {
+            if (this.compose_message_widget) {
+                this.compose_message_widget.destroy();
+            }
+            this.compose_message_widget = new mail.ComposeMessage(this, {
+                'extended_mode': false, 'uid': this.session.uid, 'res_model': 'res.users',
+                'res_id': this.session.uid, 'mode': mode || 'comment', 'msg_id': msg_id });
+            var composition_node = this.$element.find('div.oe_mail_wall_action');
+            composition_node.empty();
+            var compose_done = this.compose_message_widget.appendTo(composition_node);
+            return compose_done;
+        },
+
         /** Add events */
         add_event_handlers: function () {
             var self = this;

From 27b2ff13e5c48d5640a897b443ab9973c00bab3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 15:24:57 +0200
Subject: [PATCH 219/397] [FIX] mail: Thread: fixed avatar not showed anymore
 on quick reply boxes.

bzr revid: tde@openerp.com-20120711132457-x5u934mhcgn2iiuq
---
 addons/mail/static/src/js/mail.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0d91d7176ea..1ec18343fb9 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -662,7 +662,8 @@ openerp.mail = function(session) {
         },
 
         display_current_user: function () {
-            return this.$element.find('img.oe_mail_msg_image').attr('src', mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid));
+            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', this.params.uid);
+            return this.$element.find('img.oe_mail_icon').attr('src', avatar);
         },
         
         do_comment: function () {

From ca3a65040f664fc4355bb3e8e49d2b2a784c28d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 16:32:45 +0200
Subject: [PATCH 220/397] [IMP] mail.compose.message: when in text mode, remove
 subject.

bzr revid: tde@openerp.com-20120711143245-io0dwpp8w6dqahvr
---
 addons/mail/wizard/mail_compose_message.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 1faf26cc8a7..1d9c6c528ee 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -230,6 +230,7 @@ class mail_compose_message(osv.TransientModel):
             # default message values according to the wizard options
             if formatting:
                 content_subtype = 'html'
+                subject = mail_wiz.subject
             else:
                 content_subtype = 'text'
                 subject = False
@@ -262,7 +263,7 @@ class mail_compose_message(osv.TransientModel):
             if context.get('mail.compose.message.mode') == 'mass_mail':
                 # Mass mailing: must render the template patterns
                 for active_id in active_ids:
-                    subject = self.render_template(cr, uid, mail_wiz.subject, active_model, active_id)
+                    rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
                     rendered_body = self.render_template(cr, uid, body, active_model, active_id)
                     email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
                     email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
@@ -274,7 +275,7 @@ class mail_compose_message(osv.TransientModel):
                     # processed as soon as the mail scheduler runs.
                     if mail_thread_enabled:
                         active_model_pool.message_append(cr, uid, [active_id],
-                            subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=mail_wiz.content_subtype, state='outgoing',
+                            rendered_subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=mail_wiz.content_subtype, state='outgoing',
                             email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
@@ -286,12 +287,12 @@ class mail_compose_message(osv.TransientModel):
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
                     msg_ids = active_model_pool.message_append(cr, uid, active_ids,
-                            mail_wiz.subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=content_subtype, state='outgoing',
+                            subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=content_subtype, state='outgoing',
                             email_to=mail_wiz.email_to, email_from=mail_wiz.email_from, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
                             reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context,
                             type=type)
                 else:
-                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), mail_wiz.subject, body_text,
+                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, body_text,
                         model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id),
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]

From fa488a48d5dc95547cee6b7f43edae161bc3977d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 16:32:56 +0200
Subject: [PATCH 221/397] [IMP] mail: Chatter: added state in debug info.

bzr revid: tde@openerp.com-20120711143256-1wpd99v7l3zcx996
---
 addons/mail/static/src/xml/mail.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index dac6f467b00..156ee5c3d8a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -151,6 +151,7 @@
                         <li>id: <t t-raw="record.id"/></li>
                         <li>type: <t t-raw="record.type"/></li>
                         <li>content_subtype: <t t-raw="record.content_subtype"/></li>
+                        <li>state: <t t-raw="record.state"/></li>
                         <li>parent_id: <t t-raw="record.parent_id"/></li>
                         <li>email_from: <t t-raw="record.email_from"/></li>
                         <li>email_to: <t t-raw="record.email_to"/></li>

From 5a0b486e129a70d785c416dadeb10367c4bfc78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 17:44:47 +0200
Subject: [PATCH 222/397] [IMP] Cleditor: cleaned default options.

bzr revid: tde@openerp.com-20120711154447-ojklly0whajbte3y
---
 addons/web/static/src/js/view_form.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e38cffcfffd..83d57fe4969 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2304,18 +2304,19 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
 
     initialize_content: function() {
         this.$textarea = this.$element.find('textarea');
+        var width = ((this.node.attrs || {}).editor_width || '100%');
+        var height = ((this.node.attrs || {}).editor_height || '100%');
         this.$textarea.cleditor({
-          //width:        500, // width not including margins, borders or padding
-          //height:       250, // height not including margins, borders or padding
-          controls:     // controls to add to the toolbar
+            width:      width, // width not including margins, borders or padding
+            height:     height, // height not including margins, borders or padding
+            controls:   // controls to add to the toolbar
                         "bold italic underline strikethrough | size " +
                         "| removeformat | bullets numbering | outdent " +
                         "indent | " +
                         "link unlink | source",  
-          sizes:        // sizes in the font size popup
+            sizes:      // sizes in the font size popup
                         "1,2,3,4,5,6,7",
-          useCSS:       false, // use CSS to style HTML when possible (not supported in ie)
-          bodyStyle:    // style to assign to document body contained within the editor
+            bodyStyle:  // style to assign to document body contained within the editor
                         "margin:4px; font:13px monospace; cursor:text"
         });
         // call super now, because cleditor seems to reset the disable attr

From 8a826bbb0a6a9f143cb43a70dcfa076e5e21f3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 17:47:37 +0200
Subject: [PATCH 223/397] [IMP] WIP about ClEditor.

bzr revid: tde@openerp.com-20120711154737-gmg72s7vo6ssorm4
---
 addons/mail/static/src/css/mail.css | 9 +++++++--
 addons/mail/static/src/js/mail.js   | 7 ++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 874a0e87a11..2a2c70d804c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -311,11 +311,16 @@
 }
 
 /* body_html: cleditor */
-div.cleditorMain {
+/*.openerp div.cleditorMain {
     width: 468px !important;
-    height: 100px !important;
+    height: 115px !important;
 }
 
+.openerp div.cleditorMain iframe {
+    width: 468px !important;
+    height: 90px !important;
+}*/
+
 
 /* ------------------------------------------------------------ */
 /* Messages layout
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1ec18343fb9..6288a27b837 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -589,12 +589,8 @@ openerp.mail = function(session) {
         display_comments: function (records) {
             var self = this;
 
+            // sort comments
             mail.ChatterUtils.sort_comments(this.comments_structure, records, this.params.parent_id);
-            
-            /* WIP: map matched regexp -> records to browse with name */
-            //_(records).each(function (record) {
-                //self.do_check_internal_links(record.body_text);
-            //});
 
             //build attachments download urls and compute time-relative from dates
             for (var k in records) {
@@ -635,6 +631,7 @@ openerp.mail = function(session) {
         /** Displays a record, performs text/link formatting */
         display_comment: function (record) {
             record.body = mail.ChatterUtils.do_text_nl2br(record.body, true);
+            // if (record.type == 'email' && record.state == 'received') {
             if (record.type == 'email') {
                 record.mini_url = ('/mail/static/src/img/email_icon.png');
             } else {

From c183ec5e039900cc43e9efaf0afec51b938c9f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 12:16:07 +0200
Subject: [PATCH 224/397] [IMP] TextFieldHtml: updated default values for
 width/height of cleditor.

bzr revid: tde@openerp.com-20120712101607-hbfqhxymwyq9lf2w
---
 addons/web/static/src/js/view_form.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 83d57fe4969..caa2cb8ab7e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2304,8 +2304,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
 
     initialize_content: function() {
         this.$textarea = this.$element.find('textarea');
-        var width = ((this.node.attrs || {}).editor_width || '100%');
-        var height = ((this.node.attrs || {}).editor_height || '100%');
+        var width = ((this.node.attrs || {}).editor_width || 468);
+        var height = ((this.node.attrs || {}).editor_height || 100);
         this.$textarea.cleditor({
             width:      width, // width not including margins, borders or padding
             height:     height, // height not including margins, borders or padding
@@ -2317,8 +2317,9 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
             sizes:      // sizes in the font size popup
                         "1,2,3,4,5,6,7",
             bodyStyle:  // style to assign to document body contained within the editor
-                        "margin:4px; font:13px monospace; cursor:text"
+                        "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
         });
+        this.$cleditor = this.$textarea.cleditor()[0];
         // call super now, because cleditor seems to reset the disable attr
         this._super.apply(this, arguments);
         if (this.$textarea.attr('disabled') == 'disabled') {
@@ -2340,14 +2341,12 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
         if (show_value && this.view.options.resize_textareas) {
             this.do_resize(this.view.options.resize_textareas);
         }
-        this.$textarea.cleditor()[0].updateFrame();
+        this.$cleditor.updateFrame();
     },
 
     get_value: function() {
-        // retrive cleditor and get its html content
-        var cleditor = this.$textarea.cleditor()[0];
         // cleditor.updateTextArea();
-        var value = cleditor.$area.val();
+        var value = this.$cleditor.$area.val();
         return value;
     },
 });

From e8e1be4b83b48932cb828093fc592382afe91e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 12:16:38 +0200
Subject: [PATCH 225/397] [IMP] mail: chatter: css update (textarea in post
 composition form).

bzr revid: tde@openerp.com-20120712101638-th5o3q4bfz441whf
---
 addons/mail/static/src/css/mail.css | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 2a2c70d804c..e15ce0b1234 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -35,12 +35,13 @@
     width: 484px;
 }
 
-.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea {
+.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea,
+.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body_text textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
     margin-bottom: 8px;
-    /*float: right;*/
+    float: right;
 }
 
 .openerp ul.oe_mail_wall_threads {
@@ -161,8 +162,9 @@
     clear: both; 
 }
 
-/* TODO */
-.openerp textarea.oe_mail_compose_textarea {
+/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+.openerp textarea.oe_mail_compose_textarea,
+.openerp div.oe_mail_compose_message_body_text textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -170,7 +172,9 @@
     border: 1px solid #cccccc;
 }
 
-.openerp textarea.oe_mail_compose_textarea:focus {
+/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
+.openerp textarea.oe_mail_compose_textarea:focus,
+.openerp div.oe_mail_compose_message_body_text textarea:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -311,16 +315,10 @@
 }
 
 /* body_html: cleditor */
-/*.openerp div.cleditorMain {
-    width: 468px !important;
-    height: 115px !important;
+.openerp div.cleditorMain {
+    border: 1px solid #cccccc;
 }
 
-.openerp div.cleditorMain iframe {
-    width: 468px !important;
-    height: 90px !important;
-}*/
-
 
 /* ------------------------------------------------------------ */
 /* Messages layout

From 3facefce28921bc46d672a35d4ad2ae9edd7a036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 12:36:31 +0200
Subject: [PATCH 226/397] [IMP] mail: Chatter: updated css
 subject/destination_partners padding / width / height). Maybe hackish :) .

bzr revid: tde@openerp.com-20120712103631-y00zymi91bae38eb
---
 addons/mail/static/src/css/mail.css | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e15ce0b1234..6080c45c75c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -41,7 +41,6 @@
     height: 60px;
     padding: 4px;
     margin-bottom: 8px;
-    float: right;
 }
 
 .openerp ul.oe_mail_wall_threads {
@@ -51,7 +50,7 @@
 /* Specific display of threads in the wall */
 /* ------------------------------------------------------------ */
 
-.openerp ul.oe_mail_wall_threads textarea {
+.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea {
     width: 434px;
     height: 30px;
     padding: 4px;
@@ -163,8 +162,8 @@
 }
 
 /* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
-.openerp textarea.oe_mail_compose_textarea,
-.openerp div.oe_mail_compose_message_body_text textarea {
+.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea {
     width: 474px;
     height: 60px;
     padding: 4px;
@@ -173,8 +172,8 @@
 }
 
 /* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
-.openerp textarea.oe_mail_compose_textarea:focus,
-.openerp div.oe_mail_compose_message_body_text textarea:focus {
+.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
+.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -285,7 +284,7 @@
 }
 
 /* ------------------------------------------------------------ */
-/* mail.compose.message form view
+/* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
 
 /* form_view: delete white background */
@@ -301,7 +300,8 @@
     margin: 0px;
 }
 
-.openerp .oe_mail_msg_content table.oe_form_field {
+.openerp .oe_mail_msg_content table.oe_form_field,
+.openerp .oe_mail_msg_content div.oe_form_field {
     padding: 0px;
 }
 
@@ -315,10 +315,16 @@
 }
 
 /* body_html: cleditor */
-.openerp div.cleditorMain {
+.openerp .oe_mail_msg_content div.cleditorMain {
     border: 1px solid #cccccc;
 }
 
+/* destination_partner_ids */
+.openerp .oe_mail_msg_content div.text-core {
+    height: 22px !important;
+    width: 472px;
+}
+
 
 /* ------------------------------------------------------------ */
 /* Messages layout

From 617a3b755278586ef47c0275f6359196b31c9c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 14:44:40 +0200
Subject: [PATCH 227/397] [IMP] mail: composition form: improved usability of
 Post / Send an email -> Send / Comment.

bzr revid: tde@openerp.com-20120712124440-1ofy1big9xqsosg2
---
 addons/mail/static/src/js/mail.js                | 11 ++++++++++-
 addons/mail/wizard/mail_compose_message_view.xml |  7 +++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6288a27b837..e891327488a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -317,13 +317,22 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'Send a Message' link that toggles the form for
+            // event: click on 'Send an Email' link that toggles the form for
             // sending an email (partner_ids)
             this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
                 event.preventDefault();
                 self.params.email_mode = ! self.params.email_mode;
                 // update context of datasetsearch
                 self.ds_compose.context.email_mode = self.params.email_mode;
+                // update 'Post' button -> 'Send'
+                // update 'Send an Email' link -> 'Post a comment'
+                if (self.params.email_mode) {
+                    self.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Send</span>');
+                    self.$element.find('a.oe_mail_compose_message_email').html('Comment');
+                } else {
+                    self.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Post</span>');
+                    self.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
+                }
                 // toggle display
                 self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
             });
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index ee0c5a66e70..54e75dada62 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -52,9 +52,12 @@
                         <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
                         <field name="dest_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
+                                placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
-                        <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
-                        <a href="#" class="oe_mail_compose_message_email">Send an email</a>
+                        <div>
+                            <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
+                            or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
+                        </div>
                         <div class='oe_mail_compose_message_icons'>
                             <a href="#" class="oe_mail_compose_message_checklist">
                                 <img src='/mail/static/src/img/checklist.png/' alt='Checklist'

From 92f951693b5428f61ec33d901cc9422199ebc4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 16:17:58 +0200
Subject: [PATCH 228/397] [IMP] mail_thread: updated message_append
 documentation, and added support of partner_ids.

bzr revid: tde@openerp.com-20120712141758-qhl677a7v4b3iqqt
---
 addons/mail/mail_thread.py | 96 ++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 39 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 0bebbf8d1e2..a0da4ecc9bc 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -241,49 +241,61 @@ class mail_thread(osv.Model):
 
     def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
                         type='email', subtype=None, email_date=None, parent_id=False,
-                        content_subtype='plain', state=None, email_from=False, email_to=False,
+                        content_subtype='plain', state=None,
+                        partner_ids=None, email_from=False, email_to=False,
                         email_cc=None, email_bcc=None, reply_to=None,
                         headers=None, message_id=False, references=None,
                         attachments=None, original=None, context=None):
-        """Creates a new mail.message through message_create. The new message
-           is attached to the current mail.thread, containing all the details 
-           passed as parameters. All attachments will be attached to the 
-           thread record as well as to the actual message.
+        """ Creates a new mail.message through message_create. The new message
+            is attached to the current mail.thread, containing all the details 
+            passed as parameters. All attachments will be attached to the 
+            thread record as well as to the actual message.
            
-           This method calls message_create that will handle management of
-           subscription and notifications, and effectively create the message.
+            This method calls message_create that will handle management of
+            subscription and notifications, and effectively create the message.
            
-           If ``email_from`` is not set or ``type`` not set as 'email',
-           a note message is created (comment or system notification), 
-           without the usual envelope attributes (sender, recipients, etc.).
+            If ``email_from`` is not set or ``type`` not set as 'email',
+            a note message is created (comment or system notification), 
+            without the usual envelope attributes (sender, recipients, etc.).
 
-        :param threads: list of thread ids, or list of browse_records representing
-                        threads to which a new message should be attached
-        :param subject: subject of the message, or description of the event if this
-                        is an *event log* entry.
-        :param body_text: plaintext contents of the mail or log message
-        :param body_html: html contents of the mail or log message
-        :param type: optional type of message: 'email', 'comment', 'notification'
-        :param subtype: optional subtype of message, such as 'create' or 'cancel'
-        :param email_date: email date string if different from now, in server timezone
-        :param parent_id: id of the parent message (threaded messaging model)
-        :param content_subtype: optional content_subtype of message: 'plain' or 'html', corresponding to the main
-                        body contents (body_text or body_html).
-        :param state: optional state of message; 'received' by default
-        :param email_from: Email From / Sender address if any
-        :param email_to: Email-To / Recipient address
-        :param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
-        :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
-        :param reply_to: reply_to header
-        :param headers: mail headers to store
-        :param message_id: optional email identifier
-        :param references: optional email references
-        :param dict attachments: map of attachment filenames to binary contents, if any.
-        :param str original: optional full source of the RFC2822 email, for reference
-        :param dict context: if a ``thread_model`` value is present
-                             in the context, its value will be used
-                             to determine the model of the thread to
-                             update (instead of the current model).
+            :param threads: list of thread ids, or list of browse_records
+                representing threads to which a new message should be attached
+            :param subject: subject of the message, or description of the event;
+                this is totally optional as subjects are not important except
+                for specific messages (blog post, job offers) or for emails
+            :param body_text: plaintext contents of the mail or log message
+            :param body_html: html contents of the mail or log message
+            :param type: type of message: 'email', 'comment', 'notification';
+                email by default
+            :param subtype: subtype of message, such as 'create' or 'cancel'
+            :param email_date: email date string if different from now, in
+                server timezone
+            :param parent_id: id of the parent message (threaded messaging model)
+            :param content_subtype: optional content_subtype of message: 'plain'
+                or 'html', corresponding to the main body contents (body_text or
+                body_html).
+            :param state: state of message
+            :param partner_ids: destination partners of the message, in addition
+                to the now fully optional email_to; this method is supposed to
+                received a list of ids is not None. The specific many2many
+                instruction will be generated by this method.
+            :param email_from: Email From / Sender address if any
+            :param email_to: Email-To / Recipient address
+            :param email_cc: Comma-Separated list of Carbon Copy Emails To
+                addresses if any
+            :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To
+                addresses if any
+            :param reply_to: reply_to header
+            :param headers: mail headers to store
+            :param message_id: optional email identifier
+            :param references: optional email references
+            :param dict attachments: map of attachment filenames to binary
+                contents, if any.
+            :param str original: optional full source of the RFC2822 email, for
+                reference
+            :param dict context: if a ``thread_model`` value is present in the
+                context, its value will be used to determine the model of the
+                thread to update (instead of the current model).
         """
         if context is None:
             context = {}
@@ -319,10 +331,15 @@ class mail_thread(osv.Model):
                     'res_id': thread.id,
                 }
                 to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
-
+            # find related partner: partner_id column in thread object, or self is res.partner model
             partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
             if not partner_id and thread._name == 'res.partner':
                 partner_id = thread.id
+            # destination partners
+            if partner_ids is None:
+                partner_ids = []
+            mail_partner_ids = [6, 0, partner_ids]
+
             data = {
                 'subject': subject,
                 'body_text': body_text or (hasattr(thread, 'description') and thread.description or ''),
@@ -334,6 +351,7 @@ class mail_thread(osv.Model):
                 'content_subtype': content_subtype,
                 'state': state,
                 'message_id': message_id,
+                'partner_ids': mail_partner_ids,
                 'attachment_ids': [(6, 0, to_attach)],
                 'user_id': uid,
                 'model' : thread._name,
@@ -346,7 +364,6 @@ class mail_thread(osv.Model):
                     if isinstance(param, list):
                         param = ", ".join(param)
                 data.update({
-                    'subject': subject or _('History'),
                     'email_to': email_to,
                     'email_from': email_from or \
                         (hasattr(thread, 'user_id') and thread.user_id and thread.user_id.user_email),
@@ -385,6 +402,7 @@ class mail_thread(osv.Model):
                             subtype = msg_dict.get('subtype'),
                             content_subtype = msg_dict.get('content_subtype'),
                             state = msg_dict.get('state'),
+                            partner_ids = msg_dict.get('partner_ids'),
                             email_from = msg_dict.get('from', msg_dict.get('email_from')),
                             email_to = msg_dict.get('to', msg_dict.get('email_to')),
                             email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),

From 4d7fc2da177155343a6024f2b054d719a86e79a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 16:18:57 +0200
Subject: [PATCH 229/397] [IMP] mail: chatter: composition widget now correctly
 manage default email_mode and formatting values; refactored code related to
 those options; reply is possible for every message, and formatting and email
 mode taken into account accordingly.

bzr revid: tde@openerp.com-20120712141857-ll0pf737a2ytobiy
---
 addons/mail/static/src/js/mail.js          | 70 ++++++++++++++--------
 addons/mail/static/src/xml/mail.xml        |  3 +-
 addons/mail/wizard/mail_compose_message.py |  1 +
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e891327488a..c6d1017841c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -274,6 +274,8 @@ openerp.mail = function(session) {
             } else {
                 this.params.active_id = this.params.res_id;
             }
+            this.email_mode = false;
+            this.formatting = false;
             // create a context for the default_get of the compose form
             var context = {
                 'active_model': this.params.res_model,
@@ -305,6 +307,8 @@ openerp.mail = function(session) {
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
                 self.bind_events();
                 self.form_view.do_show();
+                if (self.params.email_mode) { self.toggle_email_mode(); }
+                if (self.params.formatting) { self.toggle_formatting_mode(); }
             });
         },
 
@@ -321,32 +325,13 @@ openerp.mail = function(session) {
             // sending an email (partner_ids)
             this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
                 event.preventDefault();
-                self.params.email_mode = ! self.params.email_mode;
-                // update context of datasetsearch
-                self.ds_compose.context.email_mode = self.params.email_mode;
-                // update 'Post' button -> 'Send'
-                // update 'Send an Email' link -> 'Post a comment'
-                if (self.params.email_mode) {
-                    self.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Send</span>');
-                    self.$element.find('a.oe_mail_compose_message_email').html('Comment');
-                } else {
-                    self.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Post</span>');
-                    self.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
-                }
-                // toggle display
-                self.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
+                self.toggle_email_mode();
             });
             // event: click on 'Formatting' icon-link that toggles the advanced
             // formatting options for writing a message (subject, body_html)
             this.$element.find('a.oe_mail_compose_message_formatting').click(function (event) {
                 event.preventDefault();
-                self.params.formatting = ! self.params.formatting;
-                // update context of datasetsearch
-                self.ds_compose.context.formatting = self.params.formatting;
-                // toggle display
-                self.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
-                self.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
-                self.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
+                self.toggle_formatting_mode();
             });
             // event: click on 'Attachment' icon-link that opens the dialog to
             // add an attachment.
@@ -364,6 +349,37 @@ openerp.mail = function(session) {
             });
         },
 
+        /**
+         * Toggle the formatting mode. */
+        toggle_formatting_mode: function() {
+            this.formatting = ! this.formatting;
+            // update context of datasetsearch
+            this.ds_compose.context.formatting = this.formatting;
+            // toggle display
+            this.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
+            this.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
+            this.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
+        },
+
+        /**
+         * Toggle the email mode. */
+        toggle_email_mode: function() {
+            this.email_mode = ! this.email_mode;
+            // update context of datasetsearch
+            this.ds_compose.context.email_mode = this.email_mode;
+            // update 'Post' button -> 'Send'
+            // update 'Send an Email' link -> 'Post a comment'
+            if (this.email_mode) {
+                this.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Send</span>');
+                this.$element.find('a.oe_mail_compose_message_email').html('Comment');
+            } else {
+                this.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Post</span>');
+                this.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
+            }
+            // toggle display
+            this.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
+        },
+
         /**
          * Update the values of the composition form; with possible different
            values for body_text and body_html. */
@@ -455,13 +471,14 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
-        instantiate_composition_form: function(mode, msg_id) {
+        instantiate_composition_form: function(mode, email_mode, formatting, msg_id) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
                 'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
+                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
+                'email_mode': email_mode || false, 'formatting': formatting || false });
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
@@ -470,6 +487,9 @@ openerp.mail = function(session) {
 
         do_customize_display: function() {
             if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
+            if (this.session.debug) {
+                this.$element.find('ul.oe_mail_debug').toggleClass('oe_mail_invisible');
+            }
         },
 
 
@@ -544,8 +564,10 @@ openerp.mail = function(session) {
             // event: click on "Reply" in msg side menu (email style)
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
                 var msg_id = event.srcElement.dataset.msg_id;
+                var email_mode = (event.srcElement.dataset.type == 'email');
+                var formatting = (event.srcElement.dataset.formatting == 'html');
                 if (! msg_id) return false;
-                self.instantiate_composition_form('reply', msg_id);
+                self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
                 event.preventDefault();
             });
             // event: click on "Debug data" in msg side menu (email style)
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 156ee5c3d8a..5cad822992a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -133,7 +133,7 @@
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
-                        <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
@@ -158,6 +158,7 @@
                         <li>email_cc: <t t-raw="record.email_cc"/></li>
                         <li>email_bcc: <t t-raw="record.email_bcc"/></li>
                         <li>reply_to: <t t-raw="record.reply_to"/></li>
+                        <li>partner_ids: <t t-raw="record.partner_ids"/></li>
                         <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
                         <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
                     </ul>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 1d9c6c528ee..8e5de884ad4 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -188,6 +188,7 @@ class mail_compose_message(osv.TransientModel):
             'body_html': quoted_body_html,
             'subject': reply_subject,
             'attachment_ids': [],
+            'dest_partner_ids': [1],
             'model': message_data.model or False,
             'res_id': message_data.res_id or False,
             'email_from': current_user.user_email or message_data.email_to or False,

From 5b32dba98f5f883a64e1500e1d4cca13f82d6c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 17:42:59 +0200
Subject: [PATCH 230/397] [WIP] mail: composition form: WIP of destionation
 partner management.

bzr revid: tde@openerp.com-20120712154259-bt4rumkj79xtt7mr
---
 addons/mail/mail_message.py                | 15 ++--
 addons/mail/mail_message_view.xml          |  6 +-
 addons/mail/mail_thread.py                 |  2 +-
 addons/mail/wizard/mail_compose_message.py | 87 ++++++++++------------
 4 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b0c2df9c1b0..e1806dabaeb 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -120,11 +120,6 @@ class mail_message_common(osv.TransientModel):
         'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
         'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
         'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'partner_ids': fields.many2many('res.partner',
-            'mail_message_common_destination_partner_rel',
-            'common_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
         'headers': fields.text('Message Headers', readonly=1,
             help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
         'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
@@ -212,6 +207,11 @@ class mail_message(osv.Model):
                         For example, it is used to add the possibility to hide \
                         notifications in the wall."),
         'partner_id': fields.many2one('res.partner', 'Related partner'),
+        'partner_ids': fields.many2many('res.partner',
+            'mail_message_destination_partner_rel',
+            'message_id', 'partner_id', 'Destination partners',
+            help="When sending emails through the social network composition wizard"\
+                 "you may choose to send a copy of the mail to partners."),
         'user_id': fields.many2one('res.users', 'Related User', readonly=1),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
@@ -291,7 +291,7 @@ class mail_message(osv.Model):
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False,
-                             email_cc=None, email_bcc=None, reply_to=False, attachments=None,
+                             email_cc=None, email_bcc=None, reply_to=False, attachments=None, partner_ids=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
                              headers=None, mail_server_id=False, auto_delete=False, context=None):
         """Schedule sending a new email message, to be sent the next time the mail scheduler runs, or
@@ -328,6 +328,8 @@ class mail_message(osv.Model):
             context = {}
         if attachments is None:
             attachments = {}
+        if partner_ids is None:
+            partner_ids = []
         attachment_obj = self.pool.get('ir.attachment')
         for param in (email_to, email_cc, email_bcc):
             if param and not isinstance(param, list):
@@ -345,6 +347,7 @@ class mail_message(osv.Model):
                 'email_to': email_to and ','.join(email_to) or '',
                 'email_cc': email_cc and ','.join(email_cc) or '',
                 'email_bcc': email_bcc and ','.join(email_bcc) or '',
+                'partner_ids': partner_ids,
                 'reply_to': reply_to,
                 'message_id': message_id,
                 'references': references,
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index ee67098110e..cdcd30abd54 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -34,7 +34,7 @@
                                 <field name="date"/>
                                 <field name="type"/>
                                 <field name="content_subtype"/>
-                                <field name="partner_ids" widget="many2many_tags" readonly="1"/>
+                                <field name="partner_ids" widget="many2many_tags"/>
                             </group>
                             <group>
                                 <field name="model"/>
@@ -128,8 +128,8 @@
                                         <field name="reply_to"/>
                                     </group>
                                     <group>
-                                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                                        <field name="partner_ids" readonly="1" WIDGET="many2many_tags"/>
+                                        <field name="partner_id" readonly="1"/>
+                                        <field name="partner_ids" widget="many2many_tags"/>
                                     </group>
                                 </group>
                                 <notebook>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a0da4ecc9bc..510cfa1063c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -338,7 +338,7 @@ class mail_thread(osv.Model):
             # destination partners
             if partner_ids is None:
                 partner_ids = []
-            mail_partner_ids = [6, 0, partner_ids]
+            mail_partner_ids = [(6, 0, partner_ids)]
 
             data = {
                 'subject': subject,
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 8e5de884ad4..c101db9ac9e 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -175,6 +175,8 @@ class mail_compose_message(osv.TransientModel):
         quoted_body_html = '> %s' % tools.ustr(body_text.replace('\n', "<br />&gt; ") or '')
         reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
         reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature)
+        # form dest_partner_ids
+        dest_partner_ids = [partner.id for partner in message_data.partner_ids]
         # Update header and references
         reply_headers = {}
         reply_references = message_data.references and tools.ustr(message_data.references) or False
@@ -188,7 +190,7 @@ class mail_compose_message(osv.TransientModel):
             'body_html': quoted_body_html,
             'subject': reply_subject,
             'attachment_ids': [],
-            'dest_partner_ids': [1],
+            'dest_partner_ids': dest_partner_ids,
             'model': message_data.model or False,
             'res_id': message_data.res_id or False,
             'email_from': current_user.user_email or message_data.email_to or False,
@@ -217,88 +219,79 @@ class mail_compose_message(osv.TransientModel):
         '''
         if context is None:
             context = {}
-        mail_message = self.pool.get('mail.message')
+        # composition wizard options
+        email_mode = context.get('email_mode')
+        formatting = context.get('formatting')
+        mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
+
+        mail_message_obj = self.pool.get('mail.message')
         for mail_wiz in self.browse(cr, uid, ids, context=context):
             # attachments
             attachment = {}
             for attach in mail_wiz.attachment_ids:
                 attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
 
-            # composition wizard options
-            email_mode = context.get('email_mode')
-            formatting = context.get('formatting')
-
-            # default message values according to the wizard options
-            if formatting:
-                content_subtype = 'html'
-                subject = mail_wiz.subject
-            else:
-                content_subtype = 'text'
-                subject = False
-            if email_mode:
-                type = 'email'
-            else:
-                type = 'comment'
+            # default values, according to the wizard options
+            subject = mail_wiz.subject if formatting else False
+            content_subtype = 'html' if formatting else 'plain'
+            type = 'email' if email_mode else 'comment'
+            partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
             references = None
             headers = {}
-            body = mail_wiz.body_html if mail_wiz.content_subtype == 'html' else mail_wiz.body_text
+            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body_text
 
-            # Get model, and check whether it is OpenChatter enabled, aka inherit from mail.thread
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                if context.get('active_ids') and context.get('active_model'):
-                    active_ids = context['active_ids']
-                    active_model = context['active_model']
-                else:
-                    active_model = mail_wiz.model
-                    active_model_pool = self.pool.get(active_model)
-                    active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
+            # get model, active_ids, and check if model is openchatter-enabled
+            if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
+                active_ids = context['active_ids']
+                active_model = context['active_model']
+            elif mass_mail_mode:
+                active_model = mail_wiz.model
+                active_model_pool = self.pool.get(active_model)
+                active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
             else:
                 active_model = mail_wiz.model
-                active_ids = [int(mail_wiz.res_id)]
+                active_ids = [mail_wiz.res_id]
             active_model_pool = self.pool.get(active_model)
-            if hasattr(active_model_pool, 'message_append'):
-                mail_thread_enabled = True
-            else:
-                mail_thread_enabled = False
+            mail_thread_enabled = hasattr(active_model_pool, 'message_append')
 
             if context.get('mail.compose.message.mode') == 'mass_mail':
                 # Mass mailing: must render the template patterns
                 for active_id in active_ids:
                     rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
-                    rendered_body = self.render_template(cr, uid, body, active_model, active_id)
+                    rendered_body_html = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
+                    rendered_body_text = self.render_template(cr, uid, mail_wiz.body_text, active_model, active_id)
                     email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
                     email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
                     email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
                     email_bcc = self.render_template(cr, uid, mail_wiz.email_bcc, active_model, active_id)
                     reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
-    
+
                     # in mass-mailing mode we only schedule the mail for sending, it will be 
                     # processed as soon as the mail scheduler runs.
                     if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id],
-                            rendered_subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=mail_wiz.content_subtype, state='outgoing',
-                            email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
+                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
+                            type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids,
+                            email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc,
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
-                        mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
+                        mail_message_obj.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_text,
                             model=mail_wiz.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
-                            attachments=attachment, references=references, res_id=active_id,
+                            attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
                             content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
             else:
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids,
-                            subject, body_text=mail_wiz.body_text, body_html=mail_wiz.body_html, content_subtype=content_subtype, state='outgoing',
-                            email_to=mail_wiz.email_to, email_from=mail_wiz.email_from, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
-                            reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context,
-                            type=type)
+                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
+                        type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids,
+                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
+                        reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
-                    msg_ids = [mail_message.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, body_text,
+                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
                         model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
-                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id),
+                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                mail_message.send(cr, uid, msg_ids, context=context)
+                mail_message_obj.send(cr, uid, msg_ids, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

From 55a6c90307c73973eeceb9aae663b573b40506ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jul 2012 13:59:02 +0200
Subject: [PATCH 231/397] [IMP] res_partner in mail: overrided name_create to
 support custom creation: info@openerp.com (name and email), and Raoul
 <raoul@raoul.fr>.

bzr revid: tde@openerp.com-20120713115902-5tecnz9gc3mbnerl
---
 addons/mail/res_partner.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 8bb012d988c..a283cd0d5da 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from osv import fields
+import re
 
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
@@ -39,6 +40,36 @@ class res_partner(osv.osv):
             search_domain = ['|'] + initial_domain + [('partner_id', 'in', ids)]
         return search_domain
 
-res_partner()
+    def name_create(self, cr, uid, name, context=None):
+        """ Overrider of orm's name_create method for partners. The purpose is
+            to handle some basic syntaxic tricks to create partners using the
+            name_create.
+            Supported syntax:
+            - 'info@mail.com': create a partner with name info@mail.com, and
+              sets its email to info@mail.com
+            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
+              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
+            - anything else: fall back on the default name_create
+            Regex :
+            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
+            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
+              Grosbedon, raoul, grosbedon.fr
+        """
+        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
+        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
+        contact_regex_res = contact_regex.findall(name)
+        email_regex_res = email_regex.findall(name)
+        if contact_regex_res:
+            name = contact_regex_res[0][1]
+            name = name.rstrip(' ') # remove extra spaces on the right
+            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
+            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        elif email_regex:
+            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
+            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        else:
+            return super(res_partner, self).create(cr, uid, name, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ebcc25e7f654f8a563d4487f2d8aabe60ffdfa0b Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 13 Jul 2012 17:46:58 +0530
Subject: [PATCH 232/397] [IMP]account:periodical-processing-view-improve

bzr revid: pja@tinyerp.com-20120713121658-ogp9wk3osmyxasvy
---
 addons/account/wizard/account_automatic_reconcile_view.xml    | 2 --
 addons/account/wizard/account_fiscalyear_close_state.xml      | 4 +---
 addons/account/wizard/account_fiscalyear_close_view.xml       | 2 --
 addons/account/wizard/account_subscription_generate_view.xml  | 2 --
 addons/account/wizard/account_use_model_view.xml              | 2 --
 addons/account/wizard/account_validate_move_view.xml          | 2 --
 addons/account_asset/wizard/wizard_asset_compute_view.xml     | 2 --
 .../account_followup/wizard/account_followup_print_view.xml   | 2 --
 8 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index be1776497b3..b7a22ea9fa8 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,8 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <separator string="Reconciliation"/>
-                    <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
                     <group col="4">
                         <field name="power"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index b31213f4bad..3ca769a282a 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -8,10 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
 	                <header>
-	                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight"  />
+	                    <button icon="terp-locked" string="Close Fiscal Year" name="data_save" type="object" class="oe_highlight"  />
 	                </header>
-	                <separator string="Close states of Fiscal year and periods"/>
-	                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
 	                <group>
 	                    <field name="fy_id"  domain="[('state','=','draft')]"/>
 	                </group>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8c4df8548f6..43850237263 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,8 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <separator string="Generate Fiscal Year Opening Entries"/>
-                    <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
                     <group col="4">
                         <field name="fy_id" domain = "[('state','=','draft')]"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 64ca3beeb11..e32439537d7 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <separator string="Generate Entries before:"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 777ab38fddf..6170ca4fe12 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <separator string="This wizard will create recurring accounting entries"/>
-	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 0d41279a7ed..991921710a7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -9,8 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post Journal Entries" version="7.0">
-                    <separator string="Post Journal Entries of a Journal"/>
-                    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
                     <group>
                         <field name="journal_id"/>
                         <field name="period_id"/>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 45d3aa22625..e9b64a33a25 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,8 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <separator string="Post Depreciation Lines"/>
-                    <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 7115fbdc738..c897b283ab0 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,8 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <separator string="Send Follow-ups"/>
-                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>

From 9c4dd0565b805472e8c8a393fde73499afdf70f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jul 2012 15:04:54 +0200
Subject: [PATCH 233/397] [IMP] res_partner:  overrided name_create to support
 custom creation: info@openerp.com (name and email), and Raoul
 <raoul@raoul.fr>.

bzr revid: tde@openerp.com-20120713130454-2x5fsvz7az3p1jln
---
 openerp/addons/base/res/res_partner.py | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 2165c8ad16d..698e0596a28 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -61,6 +61,38 @@ class res_partner_category(osv.osv):
             res.append((record['id'], name))
         return res
 
+    def name_create(self, cr, uid, name, context=None):
+        """ Overrider of orm's name_create method for partners. The purpose is
+            to handle some basic syntaxic tricks to create partners using the
+            name_create.
+            Supported syntax:
+            - 'info@mail.com': create a partner with name info@mail.com, and
+              sets its email to info@mail.com
+            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
+              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
+            - anything else: fall back on the default name_create
+            Regex :
+            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
+            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
+              Grosbedon, raoul, grosbedon.fr
+        """
+        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
+        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
+        contact_regex_res = contact_regex.findall(name)
+        email_regex_res = email_regex.findall(name)
+        if contact_regex_res:
+            name = contact_regex_res[0][1]
+            name = name.rstrip(' ') # remove extra spaces on the right
+            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
+            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        elif email_regex:
+            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
+            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        else:
+            return super(res_partner, self).create(cr, uid, name, context)
+
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]

From bbf4b854d68f6706d854ad06f71b7dd526fad87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jul 2012 15:07:01 +0200
Subject: [PATCH 234/397] [REM] Removed name_create override of res_partner in
 mail, moved to server, in res_partner original model.

bzr revid: tde@openerp.com-20120713130701-l89adgufhp07re51
---
 addons/mail/res_partner.py | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index a283cd0d5da..fc36a0fae4a 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -40,36 +40,4 @@ class res_partner(osv.osv):
             search_domain = ['|'] + initial_domain + [('partner_id', 'in', ids)]
         return search_domain
 
-    def name_create(self, cr, uid, name, context=None):
-        """ Overrider of orm's name_create method for partners. The purpose is
-            to handle some basic syntaxic tricks to create partners using the
-            name_create.
-            Supported syntax:
-            - 'info@mail.com': create a partner with name info@mail.com, and
-              sets its email to info@mail.com
-            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
-              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
-            - anything else: fall back on the default name_create
-            Regex :
-            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
-            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
-              Grosbedon, raoul, grosbedon.fr
-        """
-        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
-        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
-        contact_regex_res = contact_regex.findall(name)
-        email_regex_res = email_regex.findall(name)
-        if contact_regex_res:
-            name = contact_regex_res[0][1]
-            name = name.rstrip(' ') # remove extra spaces on the right
-            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
-            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        elif email_regex:
-            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
-            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        else:
-            return super(res_partner, self).create(cr, uid, name, context)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From db1f5921a61efceb775b130ee9a17607a28c34e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jul 2012 16:22:27 +0200
Subject: [PATCH 235/397] [MOVE] res_partner: moved name_create override in the
 correct model ^^ .

bzr revid: tde@openerp.com-20120713142227-wauo2vn7ulufkc9y
---
 openerp/addons/base/res/res_partner.py | 67 +++++++++++++-------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 698e0596a28..469196fc06b 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-import os
 import math
+import os
 from osv import osv, fields
+import re
 import tools
 from tools.translate import _
 import logging
@@ -61,38 +62,6 @@ class res_partner_category(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def name_create(self, cr, uid, name, context=None):
-        """ Overrider of orm's name_create method for partners. The purpose is
-            to handle some basic syntaxic tricks to create partners using the
-            name_create.
-            Supported syntax:
-            - 'info@mail.com': create a partner with name info@mail.com, and
-              sets its email to info@mail.com
-            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
-              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
-            - anything else: fall back on the default name_create
-            Regex :
-            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
-            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
-              Grosbedon, raoul, grosbedon.fr
-        """
-        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
-        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
-        contact_regex_res = contact_regex.findall(name)
-        email_regex_res = email_regex.findall(name)
-        if contact_regex_res:
-            name = contact_regex_res[0][1]
-            name = name.rstrip(' ') # remove extra spaces on the right
-            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
-            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        elif email_regex:
-            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
-            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
-            return self.name_get(cr, uid, [rec_id], context)[0]
-        else:
-            return super(res_partner, self).create(cr, uid, name, context)
-
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
@@ -333,6 +302,38 @@ class res_partner(osv.osv):
             res.append((record.id, name))
         return res
 
+    def name_create(self, cr, uid, name, context=None):
+        """ Overrider of orm's name_create method for partners. The purpose is
+            to handle some basic syntaxic tricks to create partners using the
+            name_create.
+            Supported syntax:
+            - 'info@mail.com': create a partner with name info@mail.com, and
+              sets its email to info@mail.com
+            - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
+              Raoul Grosbedon, and set its email to raoul@grosbedon.fr
+            - anything else: fall back on the default name_create
+            Regex :
+            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
+            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
+              Grosbedon, raoul, grosbedon.fr
+        """
+        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
+        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
+        contact_regex_res = contact_regex.findall(name)
+        email_regex_res = email_regex.findall(name)
+        if contact_regex_res:
+            name = contact_regex_res[0][1]
+            name = name.rstrip(' ') # remove extra spaces on the right
+            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
+            rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        elif email_regex:
+            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
+            rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
+            return self.name_get(cr, uid, [rec_id], context)[0]
+        else:
+            return super(res_partner, self).create(cr, uid, name, context)
+
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []

From f806af0240856efd7ad0b9a51aba9596d5ad39f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jul 2012 16:23:33 +0200
Subject: [PATCH 236/397] [IMP] mail-Chatter: composition form: improved
 behavior of 'email_mode' and 'formatting'. They now calls onchange methods,
 that gives default values for dest_partner_ids, subject and so on. Partners
 are created when toggling into email mode, if not present in the database,
 based on the email_from of the document.

bzr revid: tde@openerp.com-20120713142333-y7krivwnybxkjl5b
---
 addons/mail/res_partner.py                 |  1 -
 addons/mail/static/src/js/mail.js          | 14 ++++
 addons/mail/wizard/mail_compose_message.py | 75 +++++++++++++++++++++-
 3 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index fc36a0fae4a..ceb90041142 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -21,7 +21,6 @@
 
 from osv import osv
 from osv import fields
-import re
 
 class res_partner(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c6d1017841c..7a1951ae75c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -352,7 +352,14 @@ openerp.mail = function(session) {
         /**
          * Toggle the formatting mode. */
         toggle_formatting_mode: function() {
+            var self = this;
             this.formatting = ! this.formatting;
+            // calls onchange
+            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.params.res_model, this.params.res_id]).then(
+                function (result) {
+                    console.log(result);
+                    self.form_view.on_processed_onchange(result, []);
+                });
             // update context of datasetsearch
             this.ds_compose.context.formatting = this.formatting;
             // toggle display
@@ -364,7 +371,14 @@ openerp.mail = function(session) {
         /**
          * Toggle the email mode. */
         toggle_email_mode: function() {
+            var self = this;
             this.email_mode = ! this.email_mode;
+            // calls onchange
+            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.params.res_model, this.params.res_id]).then(
+                function (result) {
+                    console.log(result);
+                    self.form_view.on_processed_onchange(result, []);
+                });
             // update context of datasetsearch
             this.ds_compose.context.email_mode = this.email_mode;
             // update 'Post' button -> 'Send'
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index c101db9ac9e..e4e8597cadb 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -141,6 +141,35 @@ class mail_compose_message(osv.TransientModel):
         })
         return result
 
+    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
+        """ email_mode (values: True or False). This onchange on the email mode
+            allows to have some specific behavior when going in email mode, or
+            when going out of email mode.
+            Basically, dest_partner_ids is reset when going out of email
+            mode.
+            This method can be overridden for models that want to have their
+            specific behavior.
+            Note that currently, this onchange is used in mail.js and called
+            manually on the form instantiated in the Chatter.
+        """
+        if not value:
+            return {'value': {'dest_partner_ids': []}}
+        return {'value': {}}
+
+    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
+        """ onchange_formatting (values: True or False). This onchange on the
+            formatting allows to have some specific behavior when going in 
+            formatting mode, or when going out of formatting.
+            Basically, subject is reset when going out of formatting mode.
+            This method can be overridden for models that want to have their
+            specific behavior.
+            Note that currently, this onchange is used in mail.js and called
+            manually on the form instantiated in the Chatter.
+        """
+        if not value:
+            return {'value': {'subject': False}}
+        return {'value': {}}
+
     def get_message_data(self, cr, uid, message_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when replying to the given message (e.g. including the quote
@@ -343,7 +372,7 @@ class mail_compose_message_extended(osv.TransientModel):
         """ Overrides the default implementation to provide more default field values
             related to the corresponding CRM case.
         """
-        result = super(mail_compose_message_extended, self).get_value(cr, uid,  model, res_id, context=context)
+        result = super(mail_compose_message_extended, self).get_value(cr, uid, model, res_id, context=context)
         model_obj = self.pool.get(model)
         if getattr(model_obj, '_mail_compose_message', False) and res_id:
             data = model_obj.browse(cr, uid , res_id, context)
@@ -356,4 +385,48 @@ class mail_compose_message_extended(osv.TransientModel):
                 result['reply_to'] = data.section_id and data.section_id.reply_to or False
         return result
 
+    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
+        """ Overrides the default implementation to provide default values for
+            dest_partner_ids. This method checks that a partner maching the
+            ``email_from`` of the record exists. It it does not exist, it
+            creates a new partner. The found or created partner is then added
+            in dest_partner_ids.
+            Partner check/creation valid inly if the value is True, and if 
+            the model has the ``_mail_compose_message`` attribute.
+        """
+        result = super(mail_compose_message_extended, self).onchange_email_mode(cr, uid, ids, value, model, res_id, context=context)
+        model_obj = self.pool.get(model)
+        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
+            return result
+        data = model_obj.browse(cr, uid , res_id, context=context)
+        partner_obj = self.pool.get('res.partner')
+        partner_ids = partner_obj.search(cr, uid, [('email', '=', data.email_from)], context=context)
+        if partner_ids:
+            partner_id = partner_ids[0]
+        else:
+            partner_id = partner_obj.name_create(cr, uid, data.email_from, context=context)[0]
+        result['value'].update({
+            'dest_partner_ids': [partner_id],
+            'email_cc': tools.ustr(data.email_cc or ''),
+        })
+        if hasattr(data, 'section_id'):
+            result['value']['reply_to'] = data.section_id and data.section_id.reply_to or False
+        return result
+
+    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
+        """ Overrides the default implementation to provide default values for
+            the subject.
+            Subject re-creation valid only if the value is True, and if the
+            model has the ``_mail_compose_message`` attribute.
+        """
+        result = super(mail_compose_message_extended, self).onchange_formatting(cr, uid, ids, value, model, res_id, context=context)
+        model_obj = self.pool.get(model)
+        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
+            return result
+        data = model_obj.browse(cr, uid , res_id, context=context)
+        result['value'].update({
+            'subject': data.name or False,
+        })
+        return result
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 09dda00b77bbc7ae1439b8a706a7d0c4cb59905f Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Sat, 14 Jul 2012 11:57:55 +0530
Subject: [PATCH 237/397] [IMP]mrp: revert change

bzr revid: kjo@tinyerp.com-20120714062755-fyu9lqgn7xpmylz8
---
 addons/mrp/mrp.py       |   4 +-
 addons/mrp/mrp_view.xml | 290 +++++++++++++++++++++++-----------------
 2 files changed, 168 insertions(+), 126 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e389299002a..56ac47095a1 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -206,7 +206,7 @@ class mrp_bom(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
-        'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
         'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
@@ -456,7 +456,7 @@ class mrp_production(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos_qty': fields.float('Product UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0f71d6fc204..9e0c383c473 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -32,12 +32,14 @@
             </field>
         </record>
         <record id="mrp_property_group_action" model="ir.actions.act_window">
-            <field name="name">Property Group</field>
+            <field name="name">Property Groups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Define specific property groups that can be assigned to the properties of your bill of materials.</field>
+            <field name="help">
+                Define specific property groups that can be assigned to the properties of your bill of materials.
+            </field>
         </record>
         <menuitem
             id="menu_mrp_configuration"
@@ -103,7 +105,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_mrp_property_search"/>
-            <field name="help">The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the needs.</field>
+            <field name="help">
+                The Properties in OpenERP are used to select the right bill of materials for manufacturing
+            a product when you have different ways of building the same product.
+            You can assign several properties to each bill of materials.
+            When a salesperson creates a sale order, they can relate it to several properties
+            and OpenERP will automatically select the BoM to use according the needs.
+            </field>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -113,7 +121,7 @@
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="product.group_mrp_properties"
+            groups="product.group_mrp_properties,product.group_mrp_properties"
             parent="menu_mrp_configuration"
             sequence="30" />
         <menuitem
@@ -146,44 +154,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <group>
-                                <field name="name"/>
-                                <field name="resource_type"/>
-                                <field name="calendar_id" widget="selection"/>
-                            </group>
-                            <group>
-                                <field name="code"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="active"/>
-                            </group>
+                    <group col="4">
+                        <group>
+                            <field name="name"/>
+                            <field name="resource_type"/>
+                            <field name="calendar_id" widget="selection"/>
                         </group>
-                        <notebook>
-                            <page string="General Information">
-                                <group>
-                                    <group string="Capacity Information">
-                                        <field name="time_efficiency"/>
-                                        <field name="capacity_per_cycle"/>
-                                        <field name="time_cycle" widget="float_time"/>
-                                        <field name="time_start" widget="float_time"/>
-                                        <field name="time_stop" widget="float_time"/>
-                                    </group>
-                                    <group string="Costing Information">
-                                        <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                                        <field name="costs_hour"/>
-                                        <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_cycle"/>
-                                        <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                        <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                                    </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="active"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="General Information">
+                            <group>
+                                <group string="Capacity Information">
+                                    <field name="time_efficiency"/>
+                                    <field name="capacity_per_cycle"/>
+                                    <field name="time_cycle" widget="float_time"/>
+                                    <field name="time_start" widget="float_time"/>
+                                    <field name="time_stop" widget="float_time"/>
                                 </group>
-                                <label for="note"/>
-                                <field name="note"/>
-                            </page>
-                        </notebook>
-                    </sheet>
+                                <group string="Costing Information">
+                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                    <field name="costs_hour"/>
+                                    <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_cycle"/>
+                                    <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                </group>
+                            </group>
+                            <label for="note"/>
+                            <field name="note"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -239,18 +245,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <sheet>
-                        <group col="4" string="General Information">
-                            <field colspan="4" name="name"/>
-                            <field name="sequence"/>
-                            <field name="workcenter_id"/>
-                            <field name="cycle_nbr"/>
-                            <field name="hour_nbr" widget="float_time"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                        <label for="note"/>
-                        <field name="note"/>
-                    </sheet>
+                    <group col="4" string="General Information">
+                        <field colspan="4" name="name"/>
+                        <field name="sequence"/>
+                        <field name="workcenter_id"/>
+                        <field name="cycle_nbr"/>
+                        <field name="hour_nbr" widget="float_time"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <label for="note"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -261,26 +265,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <group>
-                                <field name="name"/>
-                                <field name="code"/>
-                            </group>
-                            <group>
-                                <field name="location_id"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="active"/>
-                           </group>
+                    <group col="4">
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
                         </group>
-                        <notebook>
-                            <page string="Work Center Operations">
-                                <field name="workcenter_lines"/>
-                                <label string="Notes"/>
-                                <field name="note"/>
-                            </page>
-                        </notebook>
-                    </sheet>
+                        <group>
+                            <field name="location_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
+                       </group>
+                    </group>
+                    <notebook>
+                        <page string="Work Center Operations">
+                            <field name="workcenter_lines"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -322,7 +325,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
             <field name="search_view_id" ref="mrp_routing_search_view"/>
-            <field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
+            <field name="help">
+                Routings allow you to create and manage the manufacturing operations that should be
+                followed within your work centers in order to produce a product.
+                They are attached to bills of materials that will define the required raw materials.
+            </field>
         </record>
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="mrp.group_mrp_routings" sequence="15"/>
 
@@ -337,16 +344,16 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
                     <sheet>
-                        <label for="product_id" class="oe_edit_only"/>
+                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
                         <h1>
                             <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
                             <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                         </h1>
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                        </h2>
+                        <div groups="mrp.group_mrp_routings">
+                            <label for="routing_id" class="oe_edit_only"/>
+                            <h2><field name="routing_id" class="oe_inline"/></h2>
+                        </div>
                         <group>
                             <group>
                                 <field name="name"/>
@@ -355,7 +362,7 @@
                             <group>
                                 <field name="type"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                                <label for="product_uos_qty" groups="product.group_uos"/>
                                 <div groups="product.group_uos" >
                                     <field name="product_uos_qty" 
                                         class="oe_inline"/>
@@ -369,8 +376,8 @@
                                 <field name="bom_lines" widget="one2many_list">
                                     <tree string="Components" editable="bottom">
                                         <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                        <field name="product_qty" string="Product Quantity"/>
-                                        <field name="product_uom"/>
+                                        <field name="product_qty"/>
+                                        <field name="product_uom" groups="product.group_uom"/>
                                         <field name="name" invisible="1"/>
                                         <field name="date_start"/>
                                         <field name="date_stop"/>
@@ -382,18 +389,18 @@
                             </page>
                             <page string="Properties" groups="product.group_mrp_properties">
                                 <group>
-                                        <group>
-                                            <field name="position"/>
-                                            <field name="bom_id"/>
-                                            <field name="sequence"/>
-                                            <field name="active"/>
-                                        </group>
-                                        <group>
-                                            <field name="date_start"/>
-                                            <field name="date_stop"/>
-                                            <field name="product_rounding"/>
-                                            <field name="product_efficiency"/>
-                                        </group>
+                                    <group>
+                                        <field name="position"/>
+                                        <field name="bom_id"/>
+                                        <field name="sequence"/>
+                                        <field name="active"/>
+                                    </group>
+                                    <group>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                        <field name="product_rounding"/>
+                                        <field name="product_efficiency"/>
+                                    </group>
                                 </group>
                                 <separator string="Properties"/>
                                 <field name="property_ids" widget="many2many_tags" />
@@ -443,7 +450,7 @@
                     <field name="code"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -464,8 +471,8 @@
                     <field name="code"/>
                     <field name="product_id" string="Component Product"/>
                     <field name="bom_id"/>
-                    <field name="product_qty" string="Product Quantity"/>
-                    <field name="product_uom"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -481,7 +488,13 @@
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
-            <field name="help">Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials.</field>
+            <field name="help">
+                Master Bills of Materials allow you to create and manage the list of necessary
+                raw materials used to make a finished product.
+                OpenERP uses these BoMs to automatically propose manufacturing orders according to product needs.
+                You can either create a bill of materials to define specific production steps,
+                or define a single multi-level bill of materials.
+            </field>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -490,7 +503,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
             <field name="domain">[('bom_id','!=',False)]</field>
-            <field name="help">Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used.</field>
+            <field name="help">
+                Bills of materials components are components and sub-products used to create master bills of materials.
+                Use this menu to search in which BoM a specific component is used.
+            </field>
         </record>
 
         <!-- BOM menus -->
@@ -567,7 +583,7 @@
                     <field name="date_planned"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="hour_total" sum="Total Hours"/>
                     <field name="cycle_total" sum="Total Cycles"/>
@@ -641,16 +657,16 @@
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>
                         <field name="product_qty" class="oe_inline"/>
-                        <label/>
                         <field name="product_uom" class="oe_inline"/>
-                        <label/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" class="oe_inline"/>
                     </h2>
-                    <label for="routing_id" class="oe_edit_only" groups="mrp.group_mrp_routings"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <div groups="mrp.group_mrp_routings">
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    </div>
                     <group>
                         <group>
                             <field name="name"/>
@@ -659,7 +675,7 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <label for="product_uos_qty" groups="product.group_uos" string="Product UoS Quantity"/>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
@@ -669,8 +685,8 @@
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group col="4">
-                                <group>
+                            <group>
+                                <group groups="stock.group_locations">
                                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>
@@ -678,14 +694,14 @@
                                     <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                 </group>
                             </group>
-                            <group col="4">
-                                <group col="1" colspan="2">
+                            <group>
+                                <group>
                                     <separator string="Products to Consume"/>
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id" />
                                             <field name="product_qty"  string="Quantity"/>
-                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_id"  string="Source Loc."/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
@@ -704,7 +720,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group col="1" colspan="2">
+                                <group>
                                     <separator string="Consumed Product"/>
                                     <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
@@ -725,8 +741,8 @@
                             </group>
                         </page>
                         <page string="Finished Products">
-                            <group col="4">
-                                <group col="1" colspan="2">
+                            <group>
+                                <group>
                                     <separator string="Products to Produce"/>
                                     <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree string="Products to Finish">
@@ -745,7 +761,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group col="1" colspan="2">
+                                <group>
                                     <separator string="Produced Products"/>
                                     <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
@@ -796,7 +812,7 @@
                             <field name="product_lines"/>
                         </page>
                         <page string="Extra Information">
-                            <group col="4">
+                            <group>
                                 <group>
                                 <field name="priority"/>
                                 <field name="date_start"/>
@@ -805,7 +821,7 @@
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     <field name="picking_id"/>
-                                    <field name="move_prod_id"/>
+                                    <field name="move_prod_id" groups="stock.group_locations"/>
                                 </group>
                             </group>
                         </page>
@@ -865,7 +881,12 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{}</field>
-            <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
+            <field name="help">
+                Click here to create a new Manufacturing Order.
+                &lt;p&gt;
+                To process the production, do not forget to create a Bill of Material.
+                Manufacturing orders can be automatically generated based on procurement    rules specified on the product
+            </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
             parent="menu_mrp_manufacturing" sequence="1"/>
@@ -877,7 +898,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">calendar,tree,form,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
-            <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
+            <field name="help">
+                Manufacturing Orders describe the operations that need to be carried out,
+                and the raw materials usage for each production stage.
+                You use specifications (bills of materials or BoM) to work out the raw material requirements
+                and the manufacturing orders needed for the finished products.
+                Once the bills of materials have been defined, OpenERP is capable of automatically deciding
+                on the manufacturing route depending on the needs of the company.
+            </field>
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
@@ -923,7 +951,7 @@
                         <field name="name"/>
                         <field name="product_id"/>
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" groups="product.group_uom"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
                     </group>
@@ -938,7 +966,7 @@
                 <tree string="Scheduled Products">
                     <field name="product_id"/>
                     <field name="product_qty"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="product_uos" groups="product.group_uos"/>
                 </tree>
@@ -974,10 +1002,19 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <separator string="Bill of Materials" colspan="4"/>
-                    <field name="bom_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
-                </group>
+                <page string="Procurement &amp; Locations" position="inside">
+                    <separator string="Bill of Materials"/>
+                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+                    <tree string="Bill of Materials">
+                    <field name="name" string="Component Name"/>
+                    <field name="bom_id"/>
+                    <field name="product_qty" string="Quantity of Product"/>
+                    <field name="type"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    </tree>
+                    </field>
+                </page>
             </field>
         </record>
 
@@ -1010,7 +1047,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
             <field name="search_view_id" ref="view_mrp_workcenter_search"/>
-            <field name="help">Work Centers allow you to create and manage manufacturing units.  They consist of workers and/or machines, which are considered as units for capacity and planning forecast.  Keep in mind that the working time and resource leave are not taken into account in the time computation of the work center.</field>
+            <field name="help">
+                Work Centers allow you to create and manage manufacturing units.
+                They consist of workers and/or machines, which are considered as units for capacity and planning forecast.
+                Keep in mind that the working time and resource leave are not taken into account in the time computation
+                of the work center.
+            </field>
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>

From 84d5f7b7091f0cff634eb32b32c688b20604feb1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Sat, 14 Jul 2012 12:23:27 +0530
Subject: [PATCH 238/397] [IMP]mrp: remove sheet from Bill of Materials

bzr revid: kjo@tinyerp.com-20120714065327-qof2fo89wt7ysazc
---
 addons/mrp/mrp_view.xml | 120 ++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9e0c383c473..a2d9f976d82 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -343,71 +343,69 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <sheet>
-                        <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
-                        <h1>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
-                            <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
-                        </h1>
-                        <div groups="mrp.group_mrp_routings">
-                            <label for="routing_id" class="oe_edit_only"/>
-                            <h2><field name="routing_id" class="oe_inline"/></h2>
-                        </div>
+                    <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
+                    <h1>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                        <field name="product_qty" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                    </h1>
+                    <div groups="mrp.group_mrp_routings">
+                        <label for="routing_id" class="oe_edit_only"/>
+                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    </div>
+                    <group>
                         <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="code" string="Reference"/>
-                            </group>
-                            <group>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <label for="product_uos_qty" groups="product.group_uos"/>
-                                <div groups="product.group_uos" >
-                                    <field name="product_uos_qty" 
-                                        class="oe_inline"/>
-                                    <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
-                                    <field name="product_uos" class="oe_inline"/>
-                                </div>
-                            </group>
+                            <field name="name"/>
+                            <field name="code" string="Reference"/>
                         </group>
-                        <notebook>
-                            <page string="Components">
-                                <field name="bom_lines" widget="one2many_list">
-                                    <tree string="Components" editable="bottom">
-                                        <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                        <field name="product_qty"/>
-                                        <field name="product_uom" groups="product.group_uom"/>
-                                        <field name="name" invisible="1"/>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                    </tree>
-                                </field>
-                            </page>
-                            <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                                <field name="revision_ids"/>
-                            </page>
-                            <page string="Properties" groups="product.group_mrp_properties">
+                        <group>
+                            <field name="type"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos" >
+                                <field name="product_uos_qty" 
+                                    class="oe_inline"/>
+                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/> 
+                                <field name="product_uos" class="oe_inline"/>
+                            </div>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Components">
+                            <field name="bom_lines" widget="one2many_list">
+                                <tree string="Components" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="name" invisible="1"/>
+                                    <field name="date_start"/>
+                                    <field name="date_stop"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+                            <field name="revision_ids"/>
+                        </page>
+                        <page string="Properties" groups="product.group_mrp_properties">
+                            <group>
                                 <group>
-                                    <group>
-                                        <field name="position"/>
-                                        <field name="bom_id"/>
-                                        <field name="sequence"/>
-                                        <field name="active"/>
-                                    </group>
-                                    <group>
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                        <field name="product_rounding"/>
-                                        <field name="product_efficiency"/>
-                                    </group>
+                                    <field name="position"/>
+                                    <field name="bom_id"/>
+                                    <field name="sequence"/>
+                                    <field name="active"/>
                                 </group>
-                                <separator string="Properties"/>
-                                <field name="property_ids" widget="many2many_tags" />
-                            </page>
-                        </notebook>
-                        <newline/>
-                    </sheet>
+                                <group>
+                                    <field name="date_start"/>
+                                    <field name="date_stop"/>
+                                    <field name="product_rounding"/>
+                                    <field name="product_efficiency"/>
+                                </group>
+                            </group>
+                            <separator string="Properties"/>
+                            <field name="property_ids" widget="many2many_tags" />
+                        </page>
+                    </notebook>
+                    <newline/>
                 </form>
             </field>
         </record>

From e7fe5125d1f8d3e6932c3c46376e729792f93df4 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 14 Jul 2012 23:45:25 +0530
Subject: [PATCH 239/397] [FIX]: Add four tab and remove Accounting Name.

bzr revid: atp@tinyerp.com-20120714181525-mrvr9clpzoze09sl
---
 addons/account/wizard/account_chart_view.xml  |  13 +-
 addons/account/wizard/account_move_journal.py |  12 +-
 .../account/wizard/account_tax_chart_view.xml |   9 +-
 .../account_accountant_data.xml               |   6 -
 addons/account_asset/account_asset.py         |   2 +-
 addons/account_asset/account_asset_view.xml   | 133 +++++++++---------
 .../account_voucher/account_voucher_view.xml  | 107 +++++++-------
 .../voucher_payment_receipt_view.xml          |  17 +--
 .../voucher_sales_purchase_view.xml           |   8 +-
 9 files changed, 150 insertions(+), 157 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d3f4dc1a274..5affabdd862 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,12 +7,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <group colspan="4">
-                        <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
-                        <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                    </group>
-                    <group>
-                        <field name="target_move"/>
+                    <group col="4">
+                        <label for="fiscalyear"/>
+                        <div> 
+                            <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)" class="oe_inline"/>
+                            <label align="0.7" string="(If you do not select Fiscal year it will take all open fiscal years)" class="oe_inline"/>
+                        </div><newline/>
+                        <field name="target_move"/><newline/>
                         <label for="period_from" string="Periods"/>
                         <div>
                             <field name="period_from" class="oe_inline"/>-
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 429c0b52373..bc794fdcdd1 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -105,18 +105,18 @@ class account_move_journal(osv.osv_memory):
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries" version="7.0">
-                <header>
-                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="target_move"/>
                 </group>
                 <label width="300" string="%s"/>
                 <newline/>
                 <label width="300" string="%s"/>
-            </form>""" % (open_string, journal_string, period_string)
+                <footer>
+                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>""" % (journal_string, period_string, open_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index bcbab1d26ff..d922fcf6191 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,9 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <group>
+                    <group col="4">
+                        <label for="period_id"/>
+                        <div>
+                            <field name="period_id" class="oe_inline"/>
+                            <label string="(If you do not select period it will take all open periods)" class="oe_inline"/>
+                        </div><newline/>
                         <field name="target_move"/>
-                    </group>
+	                </group>
                     <footer>
                         <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 3d665e680c3..330da2520c2 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
-            <field name="name">Accounting</field>
-        </record>
-
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index e491b858286..61d2ce89ac9 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -215,7 +215,7 @@ class account_asset_asset(osv.osv):
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 712e759eb11..86ae9276870 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -88,18 +88,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/> -
-                            <field name="code"  class="oe_inline"  placeholder="Reference"/>
-                            <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
-                        </h1>
-                       <label for="category_id" class="oe_edit_only"/>
-                       <h2>
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
+                       <field name="name" class="oe_inline"/> -
+                       <field name="code"  class="oe_inline"  placeholder="Reference"/>
+                       <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
+                    </h1>
+                    <label for="category_id" class="oe_edit_only"/>
+                    <h2>
                         <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                      </h2>
-                    </div>
+                    </h2>
                     <group>
                         <group>
                             <field name="parent_id"/>
@@ -113,65 +111,64 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                        <group>
-                            <group>
-                                <field name="purchase_value"/>
-                                <field name="salvage_value"/>
-                                <field name="value_residual"/>
-                            </group>
-                            <group>
-                                <field name="method"/>
-                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
-                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
-                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-                                <field name="method_period"/>
-                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
-                            </group>
-                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="purchase_value"/>
+	                                <field name="salvage_value"/>
+	                                <field name="value_residual"/>
+	                            </group>
+	                            <group>
+	                                <field name="method"/>
+	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
+	                            </group>
+	                        </group>
+	                        <group>
+	                            <group>
+	                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
+	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+	                                <field name="method_period"/>
+	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+	                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
+	                            </group>
+	                        </group>
                         </page>
                         <page string="Depreciation Board">
                             <field name="depreciation_line_ids" mode="tree,graph">
-                               <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
-                                  <field name="depreciation_date"/>
-                                  <field name="sequence" invisible="1"/>
-                                  <field name="depreciated_value" readonly="1"/>
-                                  <field name="amount"/>
-                                  <field name="remaining_value" readonly="1"/>
-                                  <field name="move_check"/>
-                                  <field name="parent_state" invisible="1"/>
-                                  <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
-                               </tree>
-                               <form string="Depriciation Lines"> 
-                                   <group>
-                                       <group>
-                                           <field name="asset_id" invisible="1"/>
-                                           <field name="parent_state" invisible="1"/>
-                                           <field name="name"/>
-                                           <field name="amount"/>
-                                           <field name="move_id"/>
-                                           <field name="move_check"/>
-                                           <field name="parent_state" invisible="1"/>
-                                       </group>
-                                       <group>
-                                           <field name="sequence"/>
-                                           <field name="depreciation_date"/>
-                                           <field name="depreciated_value" readonly="1"/>
+                                <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
+                                    <field name="depreciation_date"/>
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="depreciated_value" readonly="1"/>
+                                    <field name="amount"/>
+                                    <field name="remaining_value" readonly="1"/>
+                                    <field name="move_check"/>
+                                    <field name="parent_state" invisible="1"/>
+                                    <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
+                                </tree>
+                                <form string="Depriciation Lines"> 
+                                    <group>
+                                        <group>
+                                            <field name="asset_id" invisible="1"/>
+                                            <field name="parent_state" invisible="1"/>
+                                            <field name="name"/>
+                                            <field name="amount"/>
+                                            <field name="move_id"/>
+                                            <field name="move_check"/>
+                                            <field name="parent_state" invisible="1"/>
+                                        </group>
+                                        <group>
+                                            <field name="sequence"/>
+                                            <field name="depreciation_date"/>
+                                            <field name="depreciated_value" readonly="1"/>
                                            <field name="remaining_value" readonly="1"/>
-                                       </group>
-                                   </group>
-                               </form>
-                               <graph type="bar">
-                                  <field name="name"/>
-                                  <field name="amount"/>
-                                  <field name="depreciated_value"/>
-                               </graph>
-                             
+                                        </group>
+                                    </group>
+                                </form>
+                                <graph type="bar">
+                                    <field name="name"/>
+                                    <field name="amount"/>
+                                    <field name="depreciated_value"/>
+                                </graph>
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -183,8 +180,8 @@
                             <field name="note"/>
                         </page>
                     </notebook>
-              </sheet>
-           </form>
+                </sheet>
+            </form>
        </field>
     </record>
     
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4d4b9b6e760..60522168fb4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -51,29 +51,28 @@
                   </header>
                   <sheet string="Accounting Voucher">
                     <div class="oe_title">
-                     <label for="number" class="oe_edit_only"/>
-                     <h1>
-                        <field name="number"   class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
-                        <field name="type" required="1"  class="oe_inline"/>
-                        <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
-                     </h1>
-                   </div>  
-                  <group>
-                  <group>
-                     <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                     <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                     <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                  </group>
-                  <group>
-                     <field name="currency_id"/>
-                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                     <field name="reference"/>
-                     <field name="name"/>
-                  </group>
-                  </group>
-                   <field name="account_id" widget="selection" invisible="True"/>
-
+	                   <label for="number" class="oe_edit_only"/>
+	                   <h1>
+	                       <field name="number"   class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+	                       <field name="type" required="1"  class="oe_inline"/>
+	                       <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+	                   </h1>
+                    </div>  
+                    <group>
+                        <group>
+	                       <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+	                       <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+	                       <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="reference"/>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <field name="account_id" widget="selection" invisible="True"/>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -86,21 +85,21 @@
                                 </tree>
                             </field>
                             <group>
-                               <group>
-                                  <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
-                               </group>
-                               <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
-                                   <group>
-                                       <label for="tax_id"/>
-                                       <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                       <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                   </group>
-                                   <group>
-                                            <field name="amount_untaxed"/>
-                                            <field name="tax_amount" readonly="1" />
-                                            <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
-                                   </group>
-                               </group>
+                                <group>
+                                    <field name="narration" colspan="2" nolabel="1"  placeholder="Add an internal note"/>
+                                </group>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
+                                    <group>
+                                        <label for="tax_id"/>
+                                        <field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                        <button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="amount_untaxed"/>
+                                        <field name="tax_amount" readonly="1" />
+                                        <field name="amount"  class="oe_subtotal_footer_separator" readonly="1"/>
+                                    </group>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -109,26 +108,26 @@
                                 <field name="audit"/>
                             </group>
                             <field name="move_ids" readonly="1">
-                               <tree string="Journal Items">
-                                   <field name="move_id"/>
-                                   <field name="ref"/>
-                                   <field name="date"/>
-                                   <field name="statement_id"/>
-                                   <field name="partner_id"/>
-                                   <field name="account_id"/>
-                                   <field name="name"/>
-                                   <field name="debit"/>
-                                   <field name="credit"/>
-                                   <field name="state"/>
-                                   <field name="reconcile_id"/>
-                               </tree>
+                                <tree string="Journal Items">
+                                    <field name="move_id"/>
+                                    <field name="ref"/>
+                                    <field name="date"/>
+                                    <field name="statement_id"/>
+                                    <field name="partner_id"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                </tree>
                             </field>
                         </page>
                     </notebook>
                   </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                  <footer>
+                       <field name="message_ids" widget="mail_thread"/>
+                  </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e944e62e699..fcf1694dd4c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -179,9 +179,9 @@
                           <field name="pre_line" invisible="1"/>
                           <field name="type" invisible="1"/>
                           <field name="currency_id" invisible="1" colspan="4"/>
-                        </group>
-                    </group>
-                    <notebook>
+                       </group>
+                   </group>
+                   <notebook>
                         <page string="Payment Information">
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
@@ -239,9 +239,7 @@
                                         <field name="analytic_id"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
-	                                
                                 </group>
-                                
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -269,10 +267,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -445,7 +443,6 @@
                     <footer>
                         <field name="message_ids" widget="mail_thread"/>
                     </footer>
-
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index aa132b5ee6d..962eb49d61d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -170,10 +170,10 @@
                             </field>
                         </page>
                     </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>

From a74fbb4de7320f4eee381e0fd2a6d866e1bc5b32 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 12:01:21 +0530
Subject: [PATCH 240/397] [REM]: Remove tips and separator from report popup
 wizard

bzr revid: atp@tinyerp.com-20120716063121-tq9f8b4ntmncxxgc
---
 addons/account/wizard/account_report_account_balance_view.xml | 4 ----
 addons/account/wizard/account_report_general_journal_view.xml | 4 ----
 addons/account/wizard/account_report_general_ledger_view.xml  | 4 ----
 addons/account/wizard/account_report_partner_balance_view.xml | 4 ----
 addons/account/wizard/account_report_partner_ledger_view.xml  | 4 ----
 addons/account/wizard/account_report_print_journal_view.xml   | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index b700ab8a736..c42e0bc38ad 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -13,10 +13,6 @@
             <xpath expr="//field[@name='journal_ids']" position="replace">
                 <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
             </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Trial Balance" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
                 <newline/>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 96f45f9d028..93c82cd5810 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="General Journals" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                <field name="amount_currency"/>
                <newline/>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 20b6ab0f042..5078eeac88b 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="General Ledger" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your general ledger with details of all your account journals"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
                 <field name="sortby"/>
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 6dbe6d7b77b..e8abd1c68a2 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Partner Balance" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
                 <field name="display_partner"/>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index c3c731c1954..1bc223a956d 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Partner Ledger" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
                 <field name="amount_currency"/>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index cf4eb0a0c9f..9a2ef25a1fe 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -9,10 +9,6 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Journals" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of a specific journal"/>
-            </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
                 <field name="amount_currency"/>

From b3ea75636d17db12dc37cb5d4e05c8200f7cf4c3 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 12:44:55 +0530
Subject: [PATCH 241/397] [FIX]: Fix general issue.  Unknown field state in
 domain [["state","in",["done"]]] for period form "Could not get field with
 name payment_rate_currency_id "Could not get field with name algorithm

bzr revid: atp@tinyerp.com-20120716071455-r30romahsfg1zvxr
---
 addons/account/account_view.xml                     | 1 +
 addons/account_voucher/account_voucher_view.xml     | 1 +
 addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 ++-
 addons/l10n_be_invoice_bba/invoice.py               | 8 ++++----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 27590b8a34c..6bfaf23abfe 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -37,6 +37,7 @@
                                 <field name="date_start"/>
                                 <field name="date_stop"/>
                                 <field name="special"/>
+                                <field name="state"/>
                             </group>
                         </form>
                     </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index c69e386e879..6ab2ba3ade7 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -67,6 +67,7 @@
                         </group>
                         <group>
                             <field name="currency_id"/>
+                            <field name="payment_rate_currency_id"  invisible="1"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="reference"/>
                             <field name="name"/>
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 51c39a4b3be..ffa6ad68d65 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -11,8 +11,9 @@
       <field name="arch" type="xml">
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
+              <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type,algorithm,partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type,partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 4cdbca84c0a..0c767f3a54c 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -64,7 +64,7 @@ class account_invoice(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
@@ -78,15 +78,15 @@ class account_invoice(osv.osv):
                     algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
                     if not algorithm:
                         algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', algorithm)['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
         }
         result['value'].update(res_update)
         return result                    
-
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+#algorithm is not defined as field in any account related modules.so pass it as false argument.
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, algorithm=False):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  
         if (type == 'out_invoice'):

From c146212da505b5067e8d83e1f72905bdec0da96e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 12:50:02 +0530
Subject: [PATCH 242/397] [IMP]mrp: set group and remove separator

bzr revid: kjo@tinyerp.com-20120716072002-n4qznh0zxgten01c
---
 addons/mrp/mrp_view.xml | 42 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e62b3ab4183..df29cb8585b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -107,10 +107,10 @@
             <field name="search_view_id" ref="view_mrp_property_search"/>
             <field name="help">
                 The Properties in OpenERP are used to select the right bill of materials for manufacturing
-            a product when you have different ways of building the same product.
-            You can assign several properties to each bill of materials.
-            When a salesperson creates a sale order, they can relate it to several properties
-            and OpenERP will automatically select the BoM to use according the needs.
+                a product when you have different ways of building the same product.
+                You can assign several properties to each bill of materials.
+                When a salesperson creates a sale order, they can relate it to several properties
+                and OpenERP will automatically select the BoM to use according the needs.
             </field>
         </record>
         <menuitem name="Master Bill of Materials"
@@ -121,13 +121,13 @@
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="product.group_mrp_properties,product.group_mrp_properties"
+            groups="product.group_mrp_properties"
             parent="menu_mrp_configuration"
             sequence="30" />
         <menuitem
             action="mrp_property_group_action"
             parent="menu_mrp_configuration"
-            groups="base.group_no_one"
+            groups="base.group_no_one,product.group_mrp_properties"
             id="menu_mrp_property_group_action"
             sequence="35" />
 
@@ -693,8 +693,7 @@
                                 </group>
                             </group>
                             <group>
-                                <group>
-                                    <separator string="Products to Consume"/>
+                                <group string="Products to Consume">
                                     <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id" />
@@ -718,8 +717,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group>
-                                    <separator string="Consumed Product"/>
+                                <group string="Consumed Product">
                                     <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
@@ -740,8 +738,7 @@
                         </page>
                         <page string="Finished Products">
                             <group>
-                                <group>
-                                    <separator string="Products to Produce"/>
+                                <group string="Products to Produce">
                                     <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
                                         <tree string="Products to Finish">
                                             <field name="product_id" />
@@ -759,8 +756,7 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group>
-                                    <separator string="Produced Products"/>
+                                <group string="Produced Products">
                                     <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
@@ -883,7 +879,7 @@
                 Click here to create a new Manufacturing Order.
                 &lt;p&gt;
                 To process the production, do not forget to create a Bill of Material.
-                Manufacturing orders can be automatically generated based on procurement    rules specified on the product
+                Manufacturing orders can be automatically generated based on procurement    rules specified on the product.
             </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
@@ -1003,14 +999,14 @@
                 <page string="Procurement &amp; Locations" position="inside">
                     <separator string="Bill of Materials"/>
                     <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                    <tree string="Bill of Materials">
-                    <field name="name" string="Component Name"/>
-                    <field name="bom_id"/>
-                    <field name="product_qty" string="Quantity of Product"/>
-                    <field name="type"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    </tree>
+                        <tree string="Bill of Materials">
+                            <field name="name" string="Component Name"/>
+                            <field name="bom_id"/>
+                            <field name="product_qty" string="Quantity of Product"/>
+                            <field name="type"/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
+                        </tree>
                     </field>
                 </page>
             </field>

From 55709d16ad7e6d6f87256fa489cada60a9946a09 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 12:55:59 +0530
Subject: [PATCH 243/397] [IMP]mrp_operation: set tab

bzr revid: kjo@tinyerp.com-20120716072559-arupshu08x0qg2b9
---
 addons/mrp_operations/mrp_operations_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9c1666a7deb..6fbd6a667bf 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
-            <header colspan="8">
+                <header colspan="8">
                    <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
@@ -17,7 +17,7 @@
                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
                    <field name="state" widget="statusbar"/>
-            </header>
+                </header>
            </xpath>
         </field>
     </record>

From 7bbf0254346298859192f9c5b76b5000985254f7 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 13:00:05 +0530
Subject: [PATCH 244/397] [IMP]mrp_operation: remove tab

bzr revid: kjo@tinyerp.com-20120716073005-bfh6wepqjxfsp7ml
---
 addons/mrp_operations/mrp_operations_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 6fbd6a667bf..2dccc92a51e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,17 +8,17 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
+            <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
                 <header colspan="8">
-                   <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
-                   <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
-                   <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
-                   <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-                   <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
-                   <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
-                   <field name="state" widget="statusbar"/>
+                    <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
+                    <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
+                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
+                    <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
+                    <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
+                    <button name="button_done" string="Finished" states="startworking" icon="terp-check" help="Finish Order"/>
+                    <field name="state" widget="statusbar"/>
                 </header>
-           </xpath>
+            </xpath>
         </field>
     </record>
 

From 13e691d4dace4fdc6a0e63967c7a692b1a14ca7e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 13:15:59 +0530
Subject: [PATCH 245/397] [IMP]mrp: set groups

bzr revid: kjo@tinyerp.com-20120716074559-5ert6z9zlz3b7j1p
---
 addons/mrp/mrp_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index df29cb8585b..877758d660a 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -655,7 +655,7 @@
                     <label for="product_qty" class="oe_edit_only"/>
                     <h2>
                         <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline"/>
+                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
@@ -699,7 +699,7 @@
                                             <field name="product_id" />
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="location_id"  string="Source Loc."/>
+                                            <field name="location_id"  string="Source Loc." groups="stock.group_locations"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -722,7 +722,7 @@
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
-                                           <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                           <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
@@ -743,7 +743,7 @@
                                         <tree string="Products to Finish">
                                             <field name="product_id" />
                                             <field name="product_qty"/>
-                                            <field name="product_uom"  string="Unit of Measure"/>
+                                            <field name="product_uom"  string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.action_partial_move_server)d"
                                                 string="Partial"

From 98f172c523aa74563a78fb9619d9ab05a5e63e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 10:29:51 +0200
Subject: [PATCH 246/397] [IMP] mail: composition form: removed default
 body_html;

bzr revid: tde@openerp.com-20120716082951-gpn3x9vr514j0a3r
---
 addons/mail/wizard/mail_compose_message.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e4e8597cadb..b68d7d22040 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -137,7 +137,7 @@ class mail_compose_message(osv.TransientModel):
             'model': model,
             'res_id': res_id,
             'email_from': user.user_email or tools.config.get('email_from', False),
-            'body_html': '<br />---<br />' + tools.ustr(user.signature or ''),
+            'body_html': '',
         })
         return result
 
@@ -200,8 +200,9 @@ class mail_compose_message(osv.TransientModel):
         sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
         sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
         body_text = message_data.body_text or ''
+        body_html = message_data.body_html or ''
         quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
-        quoted_body_html = '> %s' % tools.ustr(body_text.replace('\n', "<br />&gt; ") or '')
+        quoted_body_html = '\n<blockquote>%s</blockquote>' % (body_html),
         reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
         reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature)
         # form dest_partner_ids

From efe9365e449d4eada1742dfc3ad1986e6d977e63 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:19:32 +0530
Subject: [PATCH 247/397] [IMP]mrp: remove unused code

bzr revid: kjo@tinyerp.com-20120716084932-9k6epzcpjjf0ukev
---
 addons/mrp/mrp_view.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 877758d660a..923a14f74a3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -405,7 +405,6 @@
                             <field name="property_ids" widget="many2many_tags" />
                         </page>
                     </notebook>
-                    <newline/>
                 </form>
             </field>
         </record>
@@ -685,7 +684,7 @@
                         <page string="Consumed Products">
                             <group>
                                 <group groups="stock.group_locations">
-                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
                                 </group>
                                 <group>
                                     <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
@@ -808,9 +807,9 @@
                         <page string="Extra Information">
                             <group>
                                 <group>
-                                <field name="priority"/>
-                                <field name="date_start"/>
-                                <field name="date_finished"/>
+                                    <field name="priority"/>
+                                    <field name="date_start"/>
+                                    <field name="date_finished"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -879,7 +878,7 @@
                 Click here to create a new Manufacturing Order.
                 &lt;p&gt;
                 To process the production, do not forget to create a Bill of Material.
-                Manufacturing orders can be automatically generated based on procurement    rules specified on the product.
+                Manufacturing orders can be automatically generated based on procurement rules specified on the product.
             </field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"

From a8db458c549c0470cc5dc4fa759336a8f430aff5 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:25:57 +0530
Subject: [PATCH 248/397] [IMP]mrp: assign group

bzr revid: kjo@tinyerp.com-20120716085557-yipr924zh1bfpems
---
 addons/mrp/mrp_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 923a14f74a3..932f4ac2928 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -760,8 +760,8 @@
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
                                             <field name="product_qty" readonly="1"/>
-                                            <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
+                                            <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
                                             <field name="prodlot_id" context="{'product_id': product_id}"/>
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>

From 49ff421fb65524b8b90db1bf3bd4b98732a8c719 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 17:25:05 +0530
Subject: [PATCH 249/397] [IMP]: ADD Menu Accounting inplace of invoicing

bzr revid: atp@tinyerp.com-20120716115505-17bb9ut14yvt1rl4
---
 addons/account_accountant/account_accountant_data.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 330da2520c2..3d665e680c3 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <!-- rename root menu "Accounting" -->
+        <record id="account.menu_finance" model="ir.ui.menu">
+            <field name="name">Accounting</field>
+        </record>
+
 <!--
         It's easier for new users to not activate this (ex: they misconfigure
         header and footer.)

From 0de4e0115509777879261783d80aea4f7dc29ac9 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 17:30:46 +0530
Subject: [PATCH 250/397] [REM]: Remove col 4 from period

bzr revid: atp@tinyerp.com-20120716120046-ofhyhl7tb7vxaaqk
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 38e2a0bb621..12ec848bb9a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2615,7 +2615,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group col="4">
+                            <group>
                                 <group>
                                     <group string="Opening Operations">
                                         <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">

From fc9c97a6eba813965c5a42d00b3e31966c71218f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 15:28:22 +0200
Subject: [PATCH 251/397] [IMP] mail: chatter/wall: added reload after posting
 a comment.

bzr revid: tde@openerp.com-20120716132822-uxzzi7lici1yev7a
---
 addons/mail/static/src/js/mail.js | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7a1951ae75c..4f12e528bdf 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,6 +291,13 @@ openerp.mail = function(session) {
                 });
         },
 
+        /**
+         * Override-hack of do_action: clean the form */
+        do_action: function(action, on_close) {
+            // this.init_comments();
+            return this._super(action, on_close);
+        },
+
         /**
          * Widget start function
          * - builds and initializes the form view */
@@ -357,7 +364,6 @@ openerp.mail = function(session) {
             // calls onchange
             var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.params.res_model, this.params.res_id]).then(
                 function (result) {
-                    console.log(result);
                     self.form_view.on_processed_onchange(result, []);
                 });
             // update context of datasetsearch
@@ -376,7 +382,6 @@ openerp.mail = function(session) {
             // calls onchange
             var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.params.res_model, this.params.res_id]).then(
                 function (result) {
-                    console.log(result);
                     self.form_view.on_processed_onchange(result, []);
                 });
             // update context of datasetsearch
@@ -485,6 +490,15 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
+        /**
+         * Override-hack of do_action: automatically reload the chatter.
+         * Normally it should be called only when clicking on 'Post/Send'
+         * in the composition form. */
+        do_action: function(action, on_close) {
+            this.init_comments();
+            return this._super(action, on_close);
+        },
+
         instantiate_composition_form: function(mode, email_mode, formatting, msg_id) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
@@ -925,8 +939,17 @@ openerp.mail = function(session) {
             var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
             return (search_view_ready && comments_ready && compose_done);
         },
-        
-        stop: function () {
+
+        /**
+         * Override-hack of do_action: automatically reload the chatter.
+         * Normally it should be called only when clicking on 'Post/Send'
+         * in the composition form. */
+        do_action: function(action, on_close) {
+            this.init_and_fetch_comments();
+            return this._super(action, on_close);
+        },
+
+        destroy: function () {
             this._super.apply(this, arguments);
         },
 

From cb13892b69896d132d5b7272a6dd3631d3cfc51b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 18:59:10 +0530
Subject: [PATCH 252/397] [FIX]: Fix some view regarding space problem.

bzr revid: atp@tinyerp.com-20120716132910-8fsw4ncbw0jov4rc
---
 addons/account/account_view.xml               |  5 +-
 addons/account/wizard/account_move_journal.py |  5 +-
 .../wizard/account_report_common_view.xml     | 14 +++---
 addons/account_budget/account_budget_view.xml |  2 +-
 .../account_voucher_view.xml                  | 46 +++++++++----------
 .../account_invoice_view.xml                  |  2 +-
 addons/l10n_be_invoice_bba/invoice.py         |  4 +-
 7 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 12ec848bb9a..b21c4239e3b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1086,8 +1086,7 @@
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
 	                            </group>
-	                            <separator string="Internal Note" colspan="4"/>
-	                            <field name="narration" colspan="4" nolabel="1"/>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note."/>
 	                        </page>
 	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
 	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -2631,7 +2630,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
 	                                        </form>
                                         </field>
                                     </group> 
-                                    <newline/>
                                     <group class="oe_subtotal_footer oe_right">
                                         <field name="balance_start" readonly="1" string="Total"/>
                                         <field name="total_entry_encoding"/>
@@ -2652,7 +2650,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
 		                                    </form>
                                         </field>
                                     </group>  
-	                                <newline/>
 	                                <group class="oe_subtotal_footer oe_right">
 	                                    <field name="balance_end" />
 	                                    <field name="balance_end_cash"/>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index bc794fdcdd1..419f2e2d09e 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,10 +107,9 @@ class account_move_journal(osv.osv_memory):
             <form string="Standard entries" version="7.0">
                 <group>
                     <field name="target_move"/>
+                    <label string="%s"/>
+                    <label  string="%s"/>
                 </group>
-                <label width="300" string="%s"/>
-                <newline/>
-                <label width="300" string="%s"/>
                 <footer>
                     <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
                     or
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 89bfc4d4b7c..aa09e7fd3a8 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -17,16 +17,16 @@
                 </group>
                 <notebook tabpos="up" colspan="4">
                     <page string="Filters" name="filters">
-                        <group col="4">
+                        <group>
                             <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
                         </group>
-                        <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" col="4" >
-                            <field name="date_from"  colspan="4"/>
-                            <field name="date_to"    colspan="4"/>
+                        <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}">
+                            <field name="date_from" />
+                            <field name="date_to" />
                         </group>
-                        <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" col="4">
-                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"   colspan="4"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  colspan="4"/>
+                        <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}">
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  />
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index f653a9d3691..16f13881034 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,7 +117,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
-                        <group col="4">
+                        <group>
                             <group>
                                 <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index b725c1c2d06..9fafdcd30c3 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -82,35 +82,33 @@
 	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
 	                                </tree>
 	                            </field>
-	                            <group>
-	                                <group string="Internal Notes">
-	                                    <field name="narration" colspan="2" nolabel="1"/>
-	                                </group>
+	                            <group col="3">
 	                                <group>
-	                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-	                                        <separator string="Currency Options" colspan="4"/>
-	                                        <field name="is_multi_currency" invisible="1"/>
-	                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-	                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-	                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
-	                                    </group>
-	                                    <group col="2">
-	                                        <separator string="Payment Options" colspan="2"/>
-	                                        <field name="writeoff_amount"/>
-	                                        <field name="payment_option" required="1"/>
-	                                        <field name="writeoff_acc_id"
-	                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-	                                               domain="[('type','=','other')]"/>
-	                                        <field name="comment"
-	                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-	                                        <field name="analytic_id"
-	                                               groups="analytic.group_analytic_accounting"/>
-	                                    </group>
+	                                    <field name="narration"  placeholder="Add an internal note." nolabel="1"/>
 	                                </group>
+                                    <group  string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                        <field name="is_multi_currency" invisible="1"/>
+                                        <field name="payment_rate" required="1" 
+                                            on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" nolabel="1" 
+                                            on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="paid_amount_in_company_currency" invisible="1"/>
+                                    </group>
+                                    <group string="Payment Options">
+                                        <field name="writeoff_amount"/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
 	                            </group>
 	                        </page>
 	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group col="4">
+	                            <group>
 	                                <field name="period_id"/>
 	                                <field name="audit"/>
 	                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index ffa6ad68d65..2d3ebbd4cd2 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -13,7 +13,7 @@
           <group col="4" colspan="2">
               <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type,partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, False, partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 0c767f3a54c..0cf55e5be64 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -78,7 +78,7 @@ class account_invoice(osv.osv):
                     algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
                     if not algorithm:
                         algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', algorithm)['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
@@ -86,7 +86,7 @@ class account_invoice(osv.osv):
         result['value'].update(res_update)
         return result                    
 #algorithm is not defined as field in any account related modules.so pass it as false argument.
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, algorithm=False):
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  
         if (type == 'out_invoice'):

From dc3d09bd463ad18a8eb8673fdde420019de01865 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 19:05:21 +0530
Subject: [PATCH 253/397] [FIX]: Fix attr into attrs

bzr revid: atp@tinyerp.com-20120716133521-qtq9u2ihrcr73elf
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b21c4239e3b..0681acddb42 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -110,7 +110,7 @@
 		                        <label for="date_start" string="Duration" />
 		                        <div>
 		                            <field name="date_start" class="oe_inline" nolabel="1"/> 
-		                            <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+		                            <span attrs="{'invisible': [('date_stop','=',False)]}"> - </span> 
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>

From 3d3b98a202630f338fb8fb4252e3363d6d1c337f Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 16 Jul 2012 19:12:33 +0530
Subject: [PATCH 254/397] [REVERT]: Revert account_vocher changes

bzr revid: atp@tinyerp.com-20120716134233-85pnxh0in2kqbmzm
---
 .../account_voucher/account_voucher_view.xml  | 145 +++++++++---------
 1 file changed, 72 insertions(+), 73 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index dc816a129e1..bb1d989606a 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -42,79 +42,78 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </header>
-                    <sheet string="Accounting Voucher">
-                        <group col="6" colspan="4">
-	                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-	                        <field name="payment_rate_currency_id" invisible="1"/>
-	                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-	                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-	                        <field name="type" required="1"/>
-	                        <field name="name" colspan="2"/>
-	                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                        <field name="reference"/>
-	                        <field name="account_id" widget="selection" invisible="True"/>
-                        </group>
-	                    <notebook colspan="4">
-	                        <page string="Voucher Entry">
-	                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-	                                <tree string="Voucher Items" editable="bottom">
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="amount" sum="Total Amount"/>
-	                                    <field name="type"/>
-	                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-	                                </tree>
-	                            </field>
-	                            <group col="3">
-	                                <group string="Internal Notes">
-	                                    <field name="narration" colspan="2" nolabel="1"/>
-	                                </group>
-	                                <group string="Other Information">
-	                                    <field name="number"/>
-	                                    <field name="currency_id"/>
-	                                </group>
-	                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-	                                    <separator string="Total" colspan="4"/>
-	                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-	                                    <field name="tax_amount" nolabel="1"/>
-	                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-	                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
-	                                </group>
-	                            </group>
-	                        </page>
-	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group col="4">
-	                                <field name="period_id"/>
-	                                <field name="audit"/>
-	                            </group>
-	                            <field name="move_ids" readonly="1">
-	                                <tree string="Journal Items">
-	                                    <field name="move_id"/>
-	                                    <field name="ref"/>
-	                                    <field name="date"/>
-	                                    <field name="statement_id"/>
-	                                    <field name="partner_id"/>
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="state"/>
-	                                    <field name="reconcile_id"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                    </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                  <header>
+                      <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                      <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </header>
+                  <sheet string="Accounting Voucher">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="type" required="1"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="reference"/>
+                        <field name="account_id" widget="selection" invisible="True"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Voucher Entry">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                                <tree string="Voucher Items" editable="bottom">
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="amount" sum="Total Amount"/>
+                                    <field name="type"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                </tree>
+                            </field>
+                            <group col="3">
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group string="Other Information">
+                                    <field name="number"/>
+                                    <field name="currency_id"/>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
+                                    <separator string="Total" colspan="4"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                    <field name="tax_amount" nolabel="1"/>
+                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                  </sheet>
+                  <div class="oe_chatter">
+                      <field name="message_ids" widget="mail_thread"/>
+                  </div>
                 </form>
             </field>
         </record>

From 5fd83d2e8080e5f056912ef84f93dcbbd9f382af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 15:54:03 +0200
Subject: [PATCH 255/397] [IMP] mail: chatter composition form: added a
 reinitialization of the widget.

bzr revid: tde@openerp.com-20120716135403-xvgc8ew0c62hrv3s
---
 addons/mail/static/src/js/mail.js          | 19 +++++++++++++++++++
 addons/mail/wizard/mail_compose_message.py |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4f12e528bdf..0eea12473ad 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,6 +291,21 @@ openerp.mail = function(session) {
                 });
         },
 
+        /**
+         * Reinitialize the widget field values to the default values. The
+         * purpose is to avoid to destroy and re-build a form view. Default
+         * values are therefore given as for an onchange. */
+        reinit: function() {
+            var self = this;
+            if (! this.form_view) return;
+            // debugger
+            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
+                function (result) {
+                    self.form_view.on_processed_onchange({'value': result}, []);
+                });
+            
+        },
+
         /**
          * Override-hack of do_action: clean the form */
         do_action: function(action, on_close) {
@@ -496,6 +511,8 @@ openerp.mail = function(session) {
          * in the composition form. */
         do_action: function(action, on_close) {
             this.init_comments();
+            if (this.compose_message_widget) {
+                this.compose_message_widget.reinit(); }
             return this._super(action, on_close);
         },
 
@@ -946,6 +963,8 @@ openerp.mail = function(session) {
          * in the composition form. */
         do_action: function(action, on_close) {
             this.init_and_fetch_comments();
+            if (this.compose_message_widget) {
+                this.compose_message_widget.reinit(); }
             return this._super(action, on_close);
         },
 
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b68d7d22040..5dbe52a957b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -103,7 +103,6 @@ class mail_compose_message(osv.TransientModel):
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             result['email_from'] = current_user.user_email or False
-
         return result
 
     _columns = {
@@ -137,7 +136,8 @@ class mail_compose_message(osv.TransientModel):
             'model': model,
             'res_id': res_id,
             'email_from': user.user_email or tools.config.get('email_from', False),
-            'body_html': '',
+            'body_html': False,
+            'body_text': False,
         })
         return result
 

From 7a1b60fb161c158bc16f1faccfce2f8092c8f443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 17:39:01 +0200
Subject: [PATCH 256/397] [FIX] mail_message: fixed ids -> id in check.

bzr revid: tde@openerp.com-20120716153901-cckf7krk0x9z4f5m
---
 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 e1806dabaeb..b7d887e4eed 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -278,7 +278,7 @@ class mail_message(osv.Model):
         """Overridden to avoid duplicating fields that are unique to each email"""
         if default is None:
             default = {}
-        self.check(cr, uid, ids, 'read', context=context)
+        self.check(cr, uid, [id], 'read', context=context)
         default.update(message_id=False,original=False,headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
     

From f33b42b5cb66b5cf1b15c1ca359c81e5c1c027c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 17:39:47 +0200
Subject: [PATCH 257/397] [IMP] mail: chatter composition form: now fetches a
 form view instead of using the default one. Also changed priority of chatter
 form view, to have the classic form view for other uses.

bzr revid: tde@openerp.com-20120716153947-1u130ky6j1u32ff0
---
 addons/mail/static/src/js/mail.js             | 46 +++++++++++++------
 .../mail/wizard/mail_compose_message_view.xml |  2 +-
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0eea12473ad..eaf23eaf7a4 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -263,12 +263,15 @@ openerp.mail = function(session) {
          *      reply mode
          */
         init: function(parent, params) {
+            var self = this;
             this._super(parent);
             // options
             this.params = params || {};
             this.params.email_mode = params.email_mode || false;
             this.params.formatting = params.formatting || false;
             this.params.mode = params.mode || 'comment';
+            this.params.form_xml_id = params.form_xml_id || 'email_compose_message_wizard_form_chatter';
+            this.params.form_view_id = false;
             if (this.params.mode == 'reply') {
                 this.params.active_id = this.params.msg_id;
             } else {
@@ -276,19 +279,6 @@ openerp.mail = function(session) {
             }
             this.email_mode = false;
             this.formatting = false;
-            // create a context for the default_get of the compose form
-            var context = {
-                'active_model': this.params.res_model,
-                'active_id': this.params.active_id,
-                'mail.compose.message.mode': this.params.mode,
-            };
-            // create a form_view on the mail.compose.message wizard
-            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
-            this.form_view = new session.web.FormView(this, this.ds_compose, false, {
-                action_buttons: false,
-                pager: false,
-                initial_mode: 'edit',
-                });
         },
 
         /**
@@ -303,7 +293,6 @@ openerp.mail = function(session) {
                 function (result) {
                     self.form_view.on_processed_onchange({'value': result}, []);
                 });
-            
         },
 
         /**
@@ -324,6 +313,35 @@ openerp.mail = function(session) {
                 this.session.session_id, 'res.users', 'avatar', this.session.uid);
             this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$element.find('div.oe_mail_msg_content').empty();
+            // create a context for the default_get of the compose form
+            var context = {
+                'active_model': this.params.res_model,
+                'active_id': this.params.active_id,
+                'mail.compose.message.mode': this.params.mode,
+            };
+            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
+            // find the id of the view to display in the chatter form
+            var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
+            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.params.form_xml_id]).then( function (result) {
+                if (result) {
+                    self.params.form_view_id = result[1];
+                }
+            }).pipe(this.proxy('create_form_view'));
+            return deferred_form_id;
+        },
+
+        /**
+         * Create a FormView, then append it to the to widget DOM. */
+        create_form_view: function () {
+            var self = this;
+            // destroy previous form_view if any
+            if (this.form_view) { this.form_view.destroy(); }
+            // create the FormView
+            this.form_view = new session.web.FormView(this, this.ds_compose, this.params.form_view_id, {
+                action_buttons: false,
+                pager: false,
+                initial_mode: 'edit',
+                });
             // add the form, bind events, activate the form
             var msg_node = this.$element.find('div.oe_mail_msg_content');
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 54e75dada62..611c8491f54 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -40,7 +40,7 @@
         <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
-            <field name="priority">1</field>
+            <field name="priority">18</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >

From 21c9788aa7ce0d0fe26350bb6412656cd3261284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 18:48:25 +0200
Subject: [PATCH 258/397] [FIX] email_template: fixed active_mode, active_id
 and active_ids.

bzr revid: tde@openerp.com-20120716164825-dj5643lgo6fk6j3h
---
 addons/email_template/wizard/mail_compose_message.py | 12 +++++++++---
 addons/mail/wizard/mail_compose_message.py           |  2 --
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index a4fd749979c..0db4dfb4455 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -27,7 +27,7 @@ from tools.translate import _
 import tools
 
 
-def _reopen(self,res_id,model):
+def _reopen(self, id, res_id, model):
     return {'type': 'ir.actions.act_window',
             'view_mode': 'form',
             'view_type': 'form',
@@ -37,7 +37,11 @@ def _reopen(self,res_id,model):
 
             # save original model in context, otherwise
             # it will be lost on the action's context switch
-            'context': {'mail.compose.target.model': model}
+            'context': {'mail.compose.target.model': model,
+                        'active_id': res_id,
+                        'active_ids': [res_id],
+                        'active_model': model,
+                        }
     }
 
 class mail_compose_message(osv.osv_memory):
@@ -114,14 +118,16 @@ class mail_compose_message(osv.osv_memory):
     def template_toggle(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context=context):
             had_template = record.use_template
+            print had_template
             record.write({'use_template': not(had_template)})
             if had_template:
                 # equivalent to choosing an empty template
                 onchange_defaults = self.on_change_template(cr, uid, record.id, not(had_template),
                                                             False, email_from=record.email_from,
                                                             email_to=record.email_to, context=context)
+                print onchange_defaults
                 record.write(onchange_defaults['value'])
-            return _reopen(self, record.id, record.model)
+            return _reopen(self, record.id, record.res_id, record.model)
 
     def save_as_template(self, cr, uid, ids, context=None):
         if context is None:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 5dbe52a957b..c8ce25def0b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -96,8 +96,6 @@ class mail_compose_message(osv.TransientModel):
             result['model'] = active_model
         if not result.get('res_id') and active_id:
             result['res_id'] = active_id
-            # if result['model'] == 'mail.message' and not result.get('parent_id'):
-            #     result['parent_id'] = context.get('active_id')
 
         # Try to provide default email_from if not specified yet
         if not result.get('email_from'):

From 2cbe5b1b7efc5df3eb591be36c8acf6b0be9f5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 19:38:37 +0200
Subject: [PATCH 259/397] [FIX] email_template Updated _reopen call according
 to new function.

bzr revid: tde@openerp.com-20120716173837-t12xb8p270uds508
---
 addons/email_template/wizard/mail_compose_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 0db4dfb4455..b7111cbb9dc 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -159,7 +159,7 @@ class mail_compose_message(osv.osv_memory):
                           'use_template': True})
 
         # _reopen same wizard screen with new template preselected
-        return _reopen(self, record.id, model)
+        return _reopen(self, record.id, record.res_id, record.model)
 
     # override the basic implementation 
     def render_template(self, cr, uid, template, model, res_id, context=None):

From c773bf396e4fbf2176191e9fccbee6809308c009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Jul 2012 19:38:51 +0200
Subject: [PATCH 260/397] [IMP] email_template: WIP of adding template feature
 in composer.

bzr revid: tde@openerp.com-20120716173851-63sz7qnqklz3c1zu
---
 .../wizard/email_compose_message_view.xml     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 96ea55da9e5..d80a86fed23 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -25,5 +25,29 @@
                 </data>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='dest_partner_ids']" position="after">
+                        <field name="use_template" colspan="1" nolabel="1" invisible="1"/>
+                        <field name="template_id" colspan="4" nolabel="1"
+                            attrs="{'invisible':[('use_template','=',False)]}"
+                            on_change="on_change_template(use_template, template_id, False, False, context)"/>
+                    </xpath>
+                    <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                string="" help="Use a message template" />
+                        <button icon="gtk-save" type="object" name="save_as_template"
+                                string="" help="Save as a new template"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
     </data>
 </openerp>

From a4879a590076b505c471056654c53f99bd035031 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 17 Jul 2012 11:09:45 +0530
Subject: [PATCH 261/397] [ADD] added summary field in ir.module.module

bzr revid: tpa@tinyerp.com-20120717053945-02f18osd5eq3eoca
---
 openerp/addons/base/module/module.py       | 2 ++
 openerp/addons/base/module/module_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fde8fcf5b9a..7a890f9095a 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -227,6 +227,7 @@ class module(osv.osv):
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
+        'summary': fields.char('Summary', size=256, translate=True, readonly=True),
     }
 
     _defaults = {
@@ -481,6 +482,7 @@ class module(osv.osv):
             'application': terp.get('application', False),
             'auto_install': terp.get('auto_install', False),
             'icon': terp.get('icon', False),
+            'summary': terp.get('summary', ''),
         }
 
     # update the list of available packages
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 5624c8ff58c..12947c827f3 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -78,7 +78,8 @@
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
-                             <field name="name"/><br/>
+                             <field name="summary"/>
+                             <field name="name" groups="base.group_no_one"/><br/>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>

From b25e73a680fc731ab33feb34d00c6e0c03a6d330 Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Tue, 17 Jul 2012 11:35:47 +0530
Subject: [PATCH 262/397] [IMP]Adding summary

bzr revid: tch@tinyerp.com-20120717060547-6owny0ouxrc1hxlu
---
 addons/account_accountant/__openerp__.py | 1 +
 addons/account_voucher/__openerp__.py    | 1 +
 addons/crm/__openerp__.py                | 1 +
 addons/event/__openerp__.py              | 1 +
 addons/hr/__openerp__.py                 | 1 +
 addons/hr_evaluation/__openerp__.py      | 1 +
 addons/hr_expense/__openerp__.py         | 1 +
 addons/hr_holidays/__openerp__.py        | 1 +
 addons/hr_recruitment/__openerp__.py     | 2 ++
 addons/hr_timesheet_sheet/__openerp__.py | 1 +
 addons/mail/__openerp__.py               | 1 +
 addons/mrp/__openerp__.py                | 2 ++
 addons/point_of_sale/__openerp__.py      | 1 +
 addons/project/__openerp__.py            | 1 +
 addons/project_gtd/__openerp__.py        | 1 +
 addons/project_issue/__openerp__.py      | 1 +
 addons/purchase/__openerp__.py           | 1 +
 addons/sale/__openerp__.py               | 1 +
 addons/stock/__openerp__.py              | 1 +
 19 files changed, 21 insertions(+)

diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index f1155311f39..4bdca34e5f3 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -24,6 +24,7 @@
     "author" : "OpenERP SA",
     "category": 'Accounting & Finance',
     "sequence": 10,
+    "summary": "Accounts Moves, Journals, Chart of Accounts",
     "description": """
 Accounting Access Rights.
 =========================
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a7899338b8e..c943724f5f2 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,6 +23,7 @@
     "name" : "eInvoicing & Payments",
     "version" : "1.0",
     "author" : 'OpenERP SA',
+    "summary": 'Supplier & Customer Invoices, Payments',
     "description": """
 Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc.
 ====================================================================================================================================
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..e9e5337ed83 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     "sequence": 2,
+    "summary": "Agenda, Lead, Opportunities",
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 1a7f3ba09c5..919cfb5846b 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -25,6 +25,7 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
+    'summary': 'Invitation, Subscription',
     'description': """
 Organization and management of Events.
 ======================================
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 71d7d9aa93d..9833e2d611c 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -26,6 +26,7 @@
     "category": "Human Resources",
     "sequence": 12,
     "website": "http://www.openerp.com",
+    "summary": "Hierarchy, Jobs, Departments",
     "description": """
 Module for human resource management.
 =====================================
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 231f4593868..fbb1bcb162f 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -25,6 +25,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "website": "http://www.openerp.com",
+    "summary": "Top-Down and Bottom-Up Evaluation",
     "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
     "depends": ["hr","base_calendar","survey"],
     "description": """
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 2a1d302e094..173b31e4b4e 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 30,
+    "summary": "Expense Validation, Invoicing",
     'description': """
 This module aims to manage employee's expenses.
 ===============================================
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 4509508b2be..9219dd92ed7 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,6 +26,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
+    "summary": "Allocation and Leaves Request, Reporting by Department",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leaves' requests.
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index e5df8cf2bf3..2fa37e66ffd 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -24,6 +25,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 24,
+    "summary": "Job Description, Recruitment Process",
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index defa3ee5873..023cb401c63 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 16,
+    "summary": "Attendance, Activities, Timing",
     'description': """
 This module helps you to easily encode and validate timesheet and attendances within the same view.
 ===================================================================================================
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index e911f24e809..cb949a63efc 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -24,6 +24,7 @@
     'version': '1.0',
     'category':'Social Network',
     "sequence": 2,
+    "summary": "Discussions, Feeds, Alerts",
     'description': """
 A bussiness oriented Social Networking with a fully-integrated email 
 and message management.
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index bdf6f63b755..f7183bf3708 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -27,6 +28,7 @@
     "website" : "http://www.openerp.com",
     "category" : "Manufacturing",
     "sequence": 18,
+    "summary": "Manufacture, Production, Bill of Material",
     "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 5e7e5578f72..f13abc4b035 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     "sequence": 6,
+    "summary": "Touchscreen Sales",
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index dad67f5dc30..b6464610711 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -27,6 +27,7 @@
     "website": "http://www.openerp.com",
     "category": "Project Management",
     "sequence": 8,
+    "summary": "Projects, Tasks",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
     "depends": ["base_setup", "base_status", "product", "analytic", "board",  "mail", "resource","web_kanban"],
     "description": """
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index d6fa568977a..c28bc6f732a 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 20,
+    "summary": "Personal Tasks",
     'description': """
 This module implements all concepts defined by the Getting Things Done methodology.
 ===================================================================================
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 9037523d41e..fa7d002f571 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.0',
     'category': 'Project Management',
     "sequence": 22,
+    "summary": "Multi Level Support",
     'description': """
 This module provides Issues/Bugs Management in Project.
 =======================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index d84408a690d..298c743d660 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -25,6 +25,7 @@
     'version': '1.1',
     'category': 'Purchase Management',
     "sequence": 19,
+    "summary": "Request for Quotation, Invoicing Control",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
 =========================================================================================
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 968d8d1cecd..d02b6278cbe 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,6 +24,7 @@
     'version': '1.0',
     'category': 'Sales Management',
     "sequence": 14,
+    "summary": "Quotation, Sales, Invoicing",
     'description': """
 The base module to manage quotations and sales orders.
 ======================================================
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 50bcb23df7b..467ba05c2a2 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,6 +23,7 @@
     "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
+    "summary": "Incoming Shipment, Deliveries, Inventory, Stock",
     "description" : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================

From 6b88b4317a7ca455f8bbae17dda60981717a65f9 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 12:19:55 +0530
Subject: [PATCH 263/397] [IMP] view imp

bzr revid: jam@tinyerp.com-20120717064955-lz3b2u3fg5hs40f4
---
 openerp/addons/base/module/module.py       | 1 -
 openerp/addons/base/module/module_view.xml | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 7a890f9095a..927cefcccb9 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -227,7 +227,6 @@ class module(osv.osv):
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
-        'summary': fields.char('Summary', size=256, translate=True, readonly=True),
     }
 
     _defaults = {
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 12947c827f3..6ae7ec3962e 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -70,6 +70,7 @@
                   <field name="icon"/>
                   <field name="name"/>
                   <field name="state"/>
+                  <field name="summary"/>
                   <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette oe_kanban_auto_height">
@@ -78,8 +79,8 @@
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
-                             <field name="summary"/>
-                             <field name="name" groups="base.group_no_one"/><br/>
+                             <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
+                             <i><field name="name" groups="base.group_no_one"/></i><br/>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>

From 67931a35d29370416eac4ee10482294964b33a40 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 14:20:28 +0530
Subject: [PATCH 264/397] [Add] Add module summary on db install

bzr revid: jam@tinyerp.com-20120717085028-2jkbf9ymrftkui45
---
 openerp/addons/base/base.sql | 1 +
 openerp/modules/db.py        | 6 +++---
 openerp/modules/module.py    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index f2cb77709ed..26d70b7ede6 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -286,6 +286,7 @@ CREATE TABLE ir_module_module (
     write_date timestamp without time zone,
     write_uid integer references res_users on delete set null,
     website character varying(256),
+    summary character varying(256),
     name character varying(128) NOT NULL,
     author character varying(128),
     url character varying(128),
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index 2449efc7fcd..7490631a3b9 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -77,8 +77,8 @@ def initialize(cr):
 
         cr.execute('INSERT INTO ir_module_module \
                 (author, website, name, shortdesc, description, \
-                    category_id, auto_install, state, certificate, web, license, application, icon, sequence) \
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+                    category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
             info['author'],
             info['website'], i, info['name'],
             info['description'], category_id,
@@ -86,7 +86,7 @@ def initialize(cr):
             info['web'],
             info['license'],
             info['application'], info['icon'],
-            info['sequence']))
+            info['sequence'], info['summary']))
         id = cr.fetchone()[0]
         cr.execute('INSERT INTO ir_model_data \
             (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', (
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 265a23190e5..b1d4de31bce 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -341,6 +341,7 @@ def load_information_from_description_file(module):
                 'web': False,
                 'website': '',
                 'sequence': 100,
+                'summary': '',
             }
             info.update(itertools.izip(
                 'depends data demo test init_xml update_xml demo_xml'.split(),

From cdffbc85845529ea383bb6ad819e5ee5f1eb80c3 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 17 Jul 2012 16:05:27 +0530
Subject: [PATCH 265/397] [IMP] Made the summary search compitiablw with
 Keywords search

bzr revid: jam@tinyerp.com-20120717103527-0898nuuhg56utkhg
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 6ae7ec3962e..6f08e8c4e3d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -43,7 +43,7 @@
                 <search string="Search modules">
                     <group col='10' colspan='4'>
                         <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
-                        <field name="description" string="Keywords"/>
+                        <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
                         <separator orientation="vertical"/>
                         <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                         <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>

From 6ab25c220605ec270c47ae24386205632f98eae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 13:02:51 +0200
Subject: [PATCH 266/397] [REM] mail: removed sbuscription hide mechanism. This
 will be re-implemented in part pi.

bzr revid: tde@openerp.com-20120717110251-3z4ox41hilz40usz
---
 addons/mail/mail_subscription.py       | 19 -----------------
 addons/mail/mail_subscription_view.xml | 28 +-------------------------
 addons/mail/mail_thread.py             | 27 -------------------------
 addons/mail/static/src/js/mail.js      | 13 ------------
 addons/mail/static/src/xml/mail.xml    |  3 ++-
 5 files changed, 3 insertions(+), 87 deletions(-)

diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py
index 2b6a8dd5342..fc82af879a9 100644
--- a/addons/mail/mail_subscription.py
+++ b/addons/mail/mail_subscription.py
@@ -44,25 +44,6 @@ class mail_subscription(osv.osv):
                         ondelete='cascade', required=True, select=1),
     }
 
-class mail_subscription_hide(osv.osv):
-    """
-    mail_subscription_hide holds the data to store the hiden notifications
-    on the Wall. Hide choices are related to a subscription, not a model
-    or a user.
-        :param: subscription_id: the related subscription
-        :param: subtype: the message subtype hiden
-    """
-    _name = 'mail.subscription.hide'
-    _rec_name = 'id'
-    _order = 'id desc'
-    _description = 'Hidden subscription'
-    _columns = {
-        'subscription_id': fields.many2one('mail.subscription', string='Subscription',
-                        ondelete='cascade', required=True, select=1),
-        'subtype': fields.char('Message subtype', size=64,
-                        required=True, help='Message subtype is a string that depends on the related model.'),
-    }
-
 class mail_notification(osv.osv):
     """
     mail_notification is a relational table modeling messages pushed to users.
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index 44af44f53c6..c3d79d48308 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -20,23 +20,6 @@
             </field>
         </record>
 
-        <!-- 
-            SUBSCRIPTION HIDE
-                !-->
-        
-        <record model="ir.ui.view" id="view_subscription_hide_tree">
-            <field name="name">mail.subscription.hide.tree</field>
-            <field name="model">mail.subscription.hide</field>
-            <field name="type">tree</field>
-            <field name="sequence">10</field>
-            <field name="arch" type="xml">
-                <tree string="Hidden subscriptions">
-                    <field name="subscription_id"/>
-                    <field name="subtype"/>
-                </tree>
-            </field>
-        </record>
-
         <!-- 
             NOTIFICATION
                 !-->
@@ -62,13 +45,6 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <record id="action_view_subscription_hide" model="ir.actions.act_window">
-            <field name="name">Hidden subscriptions</field>
-            <field name="res_model">mail.subscription.hide</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
         <record id="action_view_notifications" model="ir.actions.act_window">
             <field name="name">Pushed notif</field>
             <field name="res_model">mail.notification</field>
@@ -78,9 +54,7 @@
 
         <!-- Add subscriptions related menu entries in Settings/Email -->
         <menuitem name="Subscriptions" id="menu_email_subscriptions" parent="base.menu_email"
-                    action="action_view_subscriptions" sequence="30" groups="base.group_no_one"/>
-        <menuitem name="Hidden subscriptions" id="menu_email_subscriptions_hide" parent="base.menu_email"
-                    action="action_view_subscription_hide" sequence="31" groups="base.group_no_one"/>
+                    action="action_view_subscriptions" sequence="30" groups="base.group_no_one"/> -->
         
         <!-- Add notifications related menu entry in Settings/Email -->
         <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email"
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 510cfa1063c..0e2ee3477e9 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -179,23 +179,12 @@ class mail_thread(osv.Model):
     
     def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
         subscription_obj = self.pool.get('mail.subscription')
-        hide_obj = self.pool.get('mail.subscription.hide')
         # get body
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         
         # get subscribers
         user_sub_ids = self.message_get_subscribers(cr, uid, thread_ids, context=context)
         
-        # get hiden subscriptions
-        subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', thread_ids), ('user_id', 'in', user_sub_ids)], context=context)
-        hide_ids = hide_obj.search(cr, uid, [('subscription_id', 'in', subscription_ids), ('subtype', '=', new_msg_vals.get('subtype'))], context=context)
-        if hide_ids:
-            hiden_subscriptions = hide_obj.browse(cr, uid, hide_ids, context=context)
-            hiden_user_ids = [hiden_subscription.subscription_id.user_id.id for hiden_subscription in hiden_subscriptions]
-            notif_user_ids = [user_id for user_id in user_sub_ids if not user_id in hiden_user_ids]
-        else:
-            notif_user_ids = user_sub_ids
-        
         # add users requested via parsing message (@login)
         notif_user_ids += self.message_parse_users(cr, uid, body, context=context)
         
@@ -944,22 +933,6 @@ class mail_thread(osv.Model):
             return False
         return subscription_obj.unlink(cr, uid, to_delete_sub_ids, context=context)
 
-    def message_subscription_hide(self, cr, uid, ids, subtype=None, context=None):
-        """Hide notifications, allowing to tune the messages displayed on
-           the Wall.
-           :param subtype: a mail.message subtype. If None, it is means the
-                           user wants to hide all notifications coming from
-                           the document.
-        """
-        subscription_obj = self.pool.get('mail.subscription')
-        subscription_hide_obj = self.pool.get('mail.subscription.hide')
-        # find the related subscriptions
-        subscription_ids = subscription_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids), ('user_id', '=', uid)], context=context)
-        # hide it
-        for subscription_id in subscription_ids:
-            subscription_hide_obj.create(cr, uid, {'subscription_id': subscription_id, 'subtype': subtype}, context=context)
-        return True
-
     #------------------------------------------------------
     # Notification API
     #------------------------------------------------------
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index eaf23eaf7a4..f50a9e73ab2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -611,19 +611,6 @@ openerp.mail = function(session) {
                 event.preventDefault();
                 return call_defer;
             });
-            // event: click on 'Hide this type' in the side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) {
-                if (! confirm(_t("Do you really want to hide this type of thread ?"))) { return false; }
-                var subtype = event.srcElement.dataset.subtype;
-                if (! subtype) return false;
-                var call_defer = self.ds.call('message_subscription_hide', [[self.params.res_id], subtype]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
-                return call_defer;
-            });
             // event: click on "Reply" in msg side menu (email style)
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
                 var msg_id = event.srcElement.dataset.msg_id;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5cad822992a..3693525214f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -130,9 +130,10 @@
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
                         <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+<!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
-                        </li>
+                        </li> -->
                         <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>

From 1d319cdb73bdc75ee6eb39465825525d1530a005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 13:07:41 +0200
Subject: [PATCH 267/397] [REM] mail: removed other references to subtype.

bzr revid: tde@openerp.com-20120717110741-o6x77m51wyuj8vwt
---
 addons/crm/crm_lead.py     | 6 +++---
 addons/mail/mail_thread.py | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cd492d45d1f..adf15e93a89 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -868,16 +868,16 @@ class crm_lead(base_stage, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=message, subtype='create', context=context)
+            self.message_append_note(cr, uid, [id], body=message, context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, subtype='lost', context=context)
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, subtype='won', context=context)
+        return self.message_append_note(cr, uid, ids, body=message, context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 0e2ee3477e9..96901060fbc 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -229,7 +229,7 @@ class mail_thread(osv.Model):
         return ret_dict
 
     def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', subtype=None, email_date=None, parent_id=False,
+                        type='email', email_date=None, parent_id=False,
                         content_subtype='plain', state=None,
                         partner_ids=None, email_from=False, email_to=False,
                         email_cc=None, email_bcc=None, reply_to=None,
@@ -256,7 +256,6 @@ class mail_thread(osv.Model):
             :param body_html: html contents of the mail or log message
             :param type: type of message: 'email', 'comment', 'notification';
                 email by default
-            :param subtype: subtype of message, such as 'create' or 'cancel'
             :param email_date: email date string if different from now, in
                 server timezone
             :param parent_id: id of the parent message (threaded messaging model)
@@ -336,7 +335,6 @@ class mail_thread(osv.Model):
                 'parent_id': parent_id,
                 'date': email_date or fields.datetime.now(),
                 'type': type,
-                'subtype': subtype,
                 'content_subtype': content_subtype,
                 'state': state,
                 'message_id': message_id,
@@ -388,7 +386,6 @@ class mail_thread(osv.Model):
                             body_html= msg_dict.get('body_html'),
                             parent_id = msg_dict.get('parent_id', False),
                             type = msg_dict.get('type', 'email'),
-                            subtype = msg_dict.get('subtype'),
                             content_subtype = msg_dict.get('content_subtype'),
                             state = msg_dict.get('state'),
                             partner_ids = msg_dict.get('partner_ids'),
@@ -851,7 +848,7 @@ class mail_thread(osv.Model):
         self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
 
     def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
-                            type='notification', content_subtype='html', subtype=None, context=None):
+                            type='notification', content_subtype='html', context=None):
         if type in ['notification', 'comment']:
             subject = None
         if content_subtype == 'html':
@@ -861,7 +858,7 @@ class mail_thread(osv.Model):
             body_html = body
             body_text = body
         return self.message_append(cr, uid, ids, subject, body_html, body_text,
-                                    type, subtype, parent_id=parent_id,
+                                    type, parent_id=parent_id,
                                     content_subtype=content_subtype, context=context)
 
     #------------------------------------------------------

From 01be904ead1edd6cecf3b429a66ce698db1a02b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 13:32:21 +0200
Subject: [PATCH 268/397] [REM] mail: still removing references to subscription
 hide mechanism.

bzr revid: tde@openerp.com-20120717113221-2i1wfwjeyeckss41
---
 addons/mail/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index a37b71de4fc..1fb909f4435 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -3,6 +3,5 @@ access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription_all,mail.subscription.all,model_mail_subscription,,1,1,1,1
-access_mail_subscription_hide_all,mail.subscription.hide.all,model_mail_subscription_hide,,1,1,1,1
 access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1

From dee27fa90a80f7b3a74273661c587e926543ce11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 15:06:02 +0200
Subject: [PATCH 269/397] [FIX] Wrong var name due to removal of
 subscription.hide statements.

bzr revid: tde@openerp.com-20120717130602-1edms8c9h3dvlxhj
---
 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 96901060fbc..a234fcfcf53 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -183,7 +183,7 @@ class mail_thread(osv.Model):
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         
         # get subscribers
-        user_sub_ids = self.message_get_subscribers(cr, uid, thread_ids, context=context)
+        notif_user_ids = self.message_get_subscribers(cr, uid, thread_ids, context=context)
         
         # add users requested via parsing message (@login)
         notif_user_ids += self.message_parse_users(cr, uid, body, context=context)

From b92f0df86ce0ceda2adc4245b850721361f04b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 15:07:18 +0200
Subject: [PATCH 270/397] [IMP] email_template: cleaned wizard behavior (no
 more reloading, only value update); cleaned form view for chatter. Also
 cleaned form view for compose wizard (removed unnecessary colspan=4).

bzr revid: tde@openerp.com-20120717130718-w8c8dwv1ga9uhivs
---
 .../wizard/email_compose_message_view.xml     | 14 ++++++--
 .../wizard/mail_compose_message.py            | 32 ++++++++++++-------
 .../mail/wizard/mail_compose_message_view.xml | 10 +++---
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index d80a86fed23..2560767cd14 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -34,12 +34,22 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='dest_partner_ids']" position="after">
-                        <field name="use_template" colspan="1" nolabel="1" invisible="1"/>
-                        <field name="template_id" colspan="4" nolabel="1"
+                        <field name="use_template" colspan="2" nolabel="1" invisible="1"
+                            on_change="onchange_use_template(use_template, context)"/>
+                        <field name="template_id" colspan="2" nolabel="1"
                             attrs="{'invisible':[('use_template','=',False)]}"
                             on_change="on_change_template(use_template, template_id, False, False, context)"/>
                     </xpath>
                     <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
+<!--                         
+                        <a href="#" class="oe_mail_compose_message_template">
+                            <img src='/mail/static/src/img/template.png/' alt='Use template'
+                                title='Use a message template'/>
+                        </a>
+                        <a href="#" class="oe_mail_compose_message_template_save">
+                            <img src='/mail/static/src/img/template.png/' alt='Save as template'
+                                title='Use a message template'/>
+                        </a> -->
                         <button icon="gtk-paste" type="object" name="template_toggle"
                                 string="" help="Use a message template" />
                         <button icon="gtk-save" type="object" name="save_as_template"
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index b7111cbb9dc..ec6bb5b4dde 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -114,20 +114,30 @@ class mail_compose_message(osv.osv_memory):
 
         return {'value': values}
 
-
     def template_toggle(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context=context):
-            had_template = record.use_template
-            print had_template
-            record.write({'use_template': not(had_template)})
-            if had_template:
+            values = {}
+            use_template = record.use_template
+            print 'template_toggle: use_template: %d' % (use_template)
+            # update use_template value
+
+            # simulate an on_change on use_template
+            values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value'])
+            print 'template_toggle: values %s' % (str(values))
+            record.write(values)
+            
+            return False
+
+    def onchange_use_template(self, cr, uid, ids, use_template, context=None):
+        values = {'use_template': use_template}
+        for record in self.browse(cr, uid, ids, context=context):
+            if not use_template:
                 # equivalent to choosing an empty template
-                onchange_defaults = self.on_change_template(cr, uid, record.id, not(had_template),
-                                                            False, email_from=record.email_from,
-                                                            email_to=record.email_to, context=context)
-                print onchange_defaults
-                record.write(onchange_defaults['value'])
-            return _reopen(self, record.id, record.res_id, record.model)
+                onchange_template_values = self.on_change_template(cr, uid, record.id, use_template,
+                    False, email_from=record.email_from, email_to=record.email_to, context=context)
+                values.update(onchange_template_values['value'])
+            print 'onchange_use_template: values %s' % (str(values))
+        return {'value': values}
 
     def save_as_template(self, cr, uid, ids, context=None):
         if context is None:
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 611c8491f54..c70aad56710 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -44,14 +44,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
-                    <group col="4">
-                        <field name="subject" colspan="4" nolabel="1" placeholder="Subject..."
+                    <group>
+                        <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
-                        <field name="body_text" colspan="4" nolabel="1" placeholder="What are you working on ?"
+                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_text"/>
-                        <field name="body_html" colspan="4" nolabel="1" placeholder="What are you working on HTML ?"
+                        <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
                                 class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
-                        <field name="dest_partner_ids" colspan="4" nolabel="1" widget="many2many_tags"
+                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <div>

From 4e038b36153111fb6647f51359f564d5a7c2adcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 15:23:29 +0200
Subject: [PATCH 271/397] [IMP] email_template: override name_get, because old
 one coming from mail.message.common was quite ugly for email templates.

bzr revid: tde@openerp.com-20120717132329-5m15l8akdu8hksy4
---
 addons/email_template/email_template.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 859d4647050..16b66982d14 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -101,6 +101,11 @@ class email_template(osv.osv):
             mod_name = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
         return {'value':{'model': mod_name}}
 
+    def name_get(self, cr, uid, ids, context=None):
+        """ Override name_get of mail.message: return directly the template
+            name, and not the generated name from mail.message.common."""
+        return [(record.id, record.name) for record in self.browse(cr, uid, ids, context=context)]
+
     _columns = {
         'name': fields.char('Name', size=250),
         'model_id': fields.many2one('ir.model', 'Related document model'),

From 7bc0699330ba6f477c14b5f5c366ea564ac17c6d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 16:47:33 +0200
Subject: [PATCH 272/397] various improvements

bzr revid: mit@openerp.com-20120717144733-jxlf113kuwga98ug
---
 addons/web/static/src/css/base.css           | 26 +++++++++-----------
 addons/web/static/src/css/base.sass          | 19 ++++++--------
 addons/web/static/src/xml/base.xml           |  4 +--
 addons/web_kanban/static/src/css/kanban.css  |  6 +++--
 addons/web_kanban/static/src/css/kanban.sass | 17 +++++++------
 5 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c48ab0e3012..0a3d24d41f4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp a {
   text-decoration: none;
@@ -234,14 +234,13 @@
 .openerp.ui-dialog .ui-dialog-buttonpane {
   border-top: 1px solid #e0e0e0;
   background: #f5f7f9;
-  padding: 8px;
   margin: 0;
   -moz-border-radius: 0 0 2px 2px;
   -webkit-border-radius: 0 0 2px 2px;
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .ui-dialog-buttonpane button {
-  margin-left: 8px;
+  margin: 0;
 }
 .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
   float: left;
@@ -1855,9 +1854,12 @@
   font-weight: bold;
   font-size: 18px;
 }
+.openerp .oe_form .oe_subtotal_footer label:after {
+  content: ":";
+}
 .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator {
   font-weight: bold !important;
-  padding: 2px 8px 2px 0px !important;
+  padding: 2px 11px 2px 0px !important;
 }
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
   font-weight: normal;
@@ -2061,15 +2063,6 @@
 .openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
   display: none;
 }
-.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
-  border-right: none;
-  -webkit-border-top-right-radius: 0px;
-  -webkit-border-bottom-right-radius: 0px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
 .openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
   float: right;
   -moz-border-radius: 0;
@@ -2148,9 +2141,12 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 1px;
+  top: 2px;
   right: 0px;
 }
+.openerp .oe_form_field_many2one .oe_m2o_cm_button {
+  line-height: 14px;
+}
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 8a2c510ec42..fb67945a02d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -232,11 +232,10 @@ $sheet-max-width: 860px
         .ui-dialog-buttonpane
             border-top: 1px solid #e0e0e0
             background: #f5f7f9
-            padding: 8px
             margin: 0
             @include radius(0 0 2px 2px)
             button
-                margin-left: 8px
+                margin: 0
             .ui-dialog-buttonset
                 float: left
         .ui-dialog-titlebar-close
@@ -1444,9 +1443,11 @@ $sheet-max-width: 860px
             border-top: 1px solid #cacaca
             font-weight: bold
             font-size: 18px
+        label:after
+            content: ":"
         label.oe_subtotal_footer_separator
             font-weight: bold !important
-            padding: 2px 8px 2px 0px !important
+            padding: 2px 11px 2px 0px !important
         label.oe_form_label_help
             font-weight: normal
     // no sheet in popups
@@ -1610,14 +1611,6 @@ $sheet-max-width: 860px
         .oe_form_field_with_button.oe_no_button > .oe_button
             display: none
         .oe_form_field_with_button:not(.oe_no_button)
-            input
-                border-right: none
-                -webkit-border-top-right-radius: 0px
-                -webkit-border-bottom-right-radius: 0px
-                -moz-border-radius-topright: 0px
-                -moz-border-radius-bottomright: 0px
-                border-top-right-radius: 0px
-                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
@@ -1691,8 +1684,10 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 1px
+            top: 2px
             right: 0px
+        .oe_m2o_cm_button
+            line-height: 14px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2d9caa43bbd..0ade5dd4d89 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -945,9 +945,7 @@
     <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
         <t t-if="!widget.get('effective_readonly')">
-            <button class="oe_button oe_m2o_cm_button" title="Open Resource">
-                <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
-            </button>
+            <a href="#" class="oe_m2o_cm_button oe_e oe_right">/</a>
             <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index bfb10793b77..868fa9783fd 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,6 +1,5 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
-  background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==);
+  background: url(/web/static/src/img/form_sheetbg.png);
   height: inherit;
 }
 .openerp .oe_kanban_view .ui-sortable-placeholder {
@@ -239,6 +238,9 @@
 .openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
   width: 100%;
 }
+.openerp .oe_kanban_view .oe_kanban_ungrouped {
+  background: white;
+}
 .openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
   float: left;
   padding: 2px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 6a601ec9988..fb5bdc9dcbb 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -21,7 +21,8 @@
 
 .openerp .oe_kanban_view
     // KanbanView {{{
-    background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+    //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
+    background: url(/web/static/src/img/form_sheetbg.png)
     height: inherit
     .ui-sortable-placeholder
         border: 1px dotted black
@@ -214,12 +215,14 @@
         text-align: center
     .oe_kanban_grouped .oe_kanban_show_more .oe_button
         width: 100%
-    .oe_kanban_ungrouped .oe_kanban_record
-        float: left
-        padding: 2px
-        box-sizing: border-box
-        -moz-box-sizing: border-box
-        -webkit-box-sizing: border-box
+    .oe_kanban_ungrouped
+        background: white
+        .oe_kanban_record
+            float: left
+            padding: 2px
+            box-sizing: border-box
+            -moz-box-sizing: border-box
+            -webkit-box-sizing: border-box
     .oe_kanban_action_button
         height: 22px
         margin: 0

From 0aa8726201cbc014b06ccaf9d6c536f893167f58 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 17 Jul 2012 17:55:39 +0200
Subject: [PATCH 273/397] [FIX] web_dashboard: allow columns without actions

bzr revid: chs@openerp.com-20120717155539-dludvgbvhzfpsx83
---
 addons/web_dashboard/static/src/js/dashboard.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 0754bfd7e2b..a19151af33c 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
                 delete(action.attrs.width);
                 delete(action.attrs.height);
                 delete(action.attrs.colspan);
-                self.rpc('/web/action/load', {
-                    action_id: parseInt(action.attrs.name, 10)
-                }, function(result) {
-                    self.on_load_action(result, column_index + '_' + action_index, action.attrs);
-                });
+                var action_id = _.str.toNumber(action.attrs.name);
+                if (!_.isNaN(action_id)) {
+                    self.rpc('/web/action/load', {action_id: action_id}, function(result) {
+                        self.on_load_action(result, column_index + '_' + action_index, action.attrs);
+                    });
+                }
             });
         });
     },

From c1d7f61d1fef37609179edee3d5e0374c9f25ca7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 17 Jul 2012 17:56:11 +0200
Subject: [PATCH 274/397] [FIX] web_dashboard: generate a valid view

bzr revid: chs@openerp.com-20120717155611-ns8w0u1u0niq1q30
---
 addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index 5ca2551255c..68dda7d7f67 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -48,7 +48,7 @@
     </div>
 </t>
 <t t-name="DashBoard.xml">
-    <form t-att-string="form_title">
+    <form t-att-string="form_title" version="7.0">
         <board t-att-style="style">
             <column t-foreach="columns" t-as="column">
                 <action t-foreach="column" t-as="action" t-att="action"/>

From 5f334c53b0f168543ad4fb4af35341e16e019cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 17:57:02 +0200
Subject: [PATCH 275/397] [IMP] mail: added override of form_view to catch
 'send by email' buttons.

bzr revid: tde@openerp.com-20120717155702-qv23jeumcjcr16w0
---
 addons/mail/static/src/js/mail.js | 36 ++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f50a9e73ab2..25c922964f7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,6 +4,32 @@ openerp.mail = function(session) {
 
     var mail = session.mail = {};
 
+    /**
+     * ------------------------------------------------------------
+     * FormView
+     * ------------------------------------------------------------
+     * 
+     * Override of formview do_action method, to catch all return action about
+     * mail.compose.message. The purpose is to bind 'Send by e-mail' buttons
+     * and redirect them to the Chatter.
+     */
+
+    session.web.FormView = session.web.FormView.extend({
+
+        do_action: function(action, on_close) {
+            if (action.res_model == 'mail.compose.message') {
+                var record_thread = this.fields.message_ids;
+                var thread = record_thread.thread;
+                thread.instantiate_composition_form('comment', true, false, 0, action.context);
+                return false;
+            }
+            else {
+                return this._super(action, on_close);
+            }
+        },
+    });
+
+
     /**
      * ------------------------------------------------------------
      * ChatterUtils
@@ -267,6 +293,7 @@ openerp.mail = function(session) {
             this._super(parent);
             // options
             this.params = params || {};
+            this.params.context = params.context || {};
             this.params.email_mode = params.email_mode || false;
             this.params.formatting = params.formatting || false;
             this.params.mode = params.mode || 'comment';
@@ -314,11 +341,13 @@ openerp.mail = function(session) {
             this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$element.find('div.oe_mail_msg_content').empty();
             // create a context for the default_get of the compose form
-            var context = {
+            var widget_context = {
                 'active_model': this.params.res_model,
                 'active_id': this.params.active_id,
                 'mail.compose.message.mode': this.params.mode,
             };
+            var context = _.extend({}, this.params.context, widget_context);
+            // console.log(context);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
@@ -534,14 +563,15 @@ openerp.mail = function(session) {
             return this._super(action, on_close);
         },
 
-        instantiate_composition_form: function(mode, email_mode, formatting, msg_id) {
+        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
                 'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
                 'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'email_mode': email_mode || false, 'formatting': formatting || false });
+                'email_mode': email_mode || false, 'formatting': formatting || false,
+                'context': context || false } );
             var composition_node = this.$element.find('div.oe_mail_thread_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);

From 0fb838686c78ee24a0ea2cce0247d782ce0b97d9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 18:25:07 +0200
Subject: [PATCH 276/397] [IMP] give higher sequence numbers (with wider gaps)
 to top menu items it should now be easier to insert new elements wherever we
 want in the main menu

bzr revid: abo@openerp.com-20120717162507-eezg0luxap793wrx
---
 openerp/addons/base/base_menu.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 90c7dd348e6..6c8055ff8d4 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_reporting" name="Reporting" sequence="90" groups="base.group_user"/>
+
+        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
-        <menuitem id="menu_administration" name="Settings" sequence="100"/>
+
+        <menuitem id="menu_administration" name="Settings" sequence="180"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
@@ -12,11 +14,13 @@
             <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
                 <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
                 <menuitem id="menu_translation_export" name="Import / Export" parent="menu_translation" sequence="3" groups="base.group_no_one"/>
+
             <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
                 <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
                 <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
+
     </data>
 </openerp>

From 2b59d63699aea495dfb747a3b90b527db2f81409 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 18:25:28 +0200
Subject: [PATCH 277/397] [IMP] give higher sequence numbers (with wider gaps)
 to top menu items it should now be easier to insert new elements wherever we
 want in the main menu

bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4
---
 addons/account/account_menuitem.xml         |  2 +-
 addons/base_tools/tools_view.xml            |  4 ++-
 addons/event/event_view.xml                 | 33 ++++++++++----------
 addons/hr/hr_view.xml                       | 14 ++++-----
 addons/knowledge/knowledge_view.xml         |  2 +-
 addons/mail/mail_thread_view.xml            |  4 +--
 addons/marketing/marketing_view.xml         |  5 ++-
 addons/membership/membership_view.xml       |  8 ++---
 addons/mrp/mrp_view.xml                     |  6 ++--
 addons/point_of_sale/point_of_sale_view.xml | 34 ++++++++++++---------
 addons/project/project_view.xml             | 15 ++++-----
 addons/purchase/purchase_view.xml           |  4 +--
 addons/sale/sale_view.xml                   |  4 +--
 addons/stock/stock_view.xml                 | 12 ++++----
 addons/survey/survey_view.xml               | 24 ++++++++-------
 15 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index c2275c0e461..401f77c9f94 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
+        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index eb51e000c1b..0541e452620 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
           <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="28"
+                    name="Tools" sequence="160"
                     web_icon="images/tools.png"
                     web_icon_hover="images/tools-hover.png"/>
+
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1b1b5daa9a9..11e2322a0d8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-      <act_window
+        <act_window
             id="act_event_list_register_event"
             name="Registration"
             res_model="event.registration"
@@ -9,12 +9,13 @@
             view_mode="calendar,tree,form,graph"
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
-        <menuitem  name="Events" id="event_main_menu"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
-    <!-- EVENTS  -->
+        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
-    <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
+        <!-- EVENTS  -->
+
+        <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
         <record model="ir.ui.view" id="view_event_type_form">
             <field name="name">Event type</field>
             <field name="model">event.type</field>
@@ -52,7 +53,7 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+        <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
@@ -111,7 +112,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
-                        </div> 
+                        </div>
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
                             </h2>
@@ -151,7 +152,7 @@
                                     </group>
                                     <group>
                                         <field name="register_attended"/>
-                                    </group> 
+                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
@@ -222,7 +223,7 @@
 
         <!-- Event Kanban View -->
 
-    <record model="ir.ui.view" id="view_event_kanban">
+        <record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
             <field name="type">kanban</field>
@@ -286,7 +287,7 @@
             </field>
         </record>
 
-      <!-- Events  Calendar  View -->
+        <!-- Events  Calendar  View -->
 
         <record id="view_event_calendar" model="ir.ui.view">
             <field name="name">event.event.calendar</field>
@@ -316,7 +317,7 @@
             </field>
         </record>
 
-    <!-- Event Search View -->
+        <!-- Event Search View -->
 
         <record model="ir.ui.view" id="view_event_search">
             <field name="name">Events</field>
@@ -362,7 +363,7 @@
 
 
         <!-- Events Organisation/CONFIGURATION/EVENTS  -->
-       <record model="ir.actions.act_window" id="action_event_view">
+        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
@@ -371,9 +372,9 @@
            <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
-       </record>
+        </record>
 
-      <act_window
+        <act_window
             id="act_register_event_partner"
             name="Subscribe"
             res_model="event.registration"
@@ -382,9 +383,9 @@
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
+        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 54ced534880..6e798449fba 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -213,7 +213,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_employee_form"/>
             <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record> 
+        </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
@@ -418,8 +418,8 @@
                 <search string="Jobs">
                     <field name="name" string="Job"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"  
-                            domain="[('state','=','open')]" 
+                    <filter icon="terp-camera_test"
+                            domain="[('state','=','open')]"
                             string="In Position"
                             help="In Position"/>
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
@@ -435,7 +435,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
@@ -452,7 +452,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index cdc176b347f..b2eefd90cce 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,7 +1,7 @@
 <openerp>
 <data>
     <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="19" groups="base.group_system,base.group_document_user"
+              sequence="130" groups="base.group_system,base.group_document_user"
               web_icon="images/knowledge.png"
               web_icon_hover="images/knowledge-hover.png"/>
     <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a32045efafc..f15141d3711 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,9 +3,9 @@
     <data>
 
         <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
+        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" 
+            web_icon_hover="static/src/img/feeds-hover.png"
             groups="base.group_user"/>
 
         <!-- left-side menu: Feeds !-->
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a697d586cd4..e9ee0a11e97 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,11 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem
-            name="Marketing"
+        <menuitem name="Marketing"
             icon="terp-crm"
             id="base.marketing_menu"
-            sequence="17"
+            sequence="120"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9c566a69bde..6a421130544 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <!-- MEMBERSHIP -->
 
         <!-- MEMBERSHIP/MEMBERSHIP PRODUCTS -->
@@ -71,7 +69,7 @@
                             <group>
                                 <label for="membership_date_from" string="Membership Duration"/>
                                 <div>
-                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> -
                                     <field name="membership_date_to" required="1" class="oe_inline"/>
                                 </div>
                                 <field name="list_price" string="Membership Fee"/>
@@ -133,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
@@ -282,7 +280,7 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-<!-- View for product.product object inherited from product module................ -->
+        <!-- View for product.product object inherited from product module -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
             <field name="name">product.normal.form</field>
             <field name="type">form</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 86b0fcee0d5..ac6c82f6642 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="8"
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
+            groups="group_mrp_user,group_mrp_manager" sequence="60"
             web_icon="images/manufacturing.png"
             web_icon_hover="images/manufacturing-hover.png"/>
 
@@ -336,7 +336,7 @@
                     <sheet>
                         <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
                         <h1>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
                         </h1>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f3b491116b7..7f99599a04b 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
             icon="terp-partner"
             groups="group_pos_manager"
@@ -8,7 +9,7 @@
             web_icon_hover="images/pos-hover.png"/>
 
         <record id="categ_others" model="pos.category">
-          <field name="name">Others</field>
+            <field name="name">Others</field>
         </record>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
@@ -16,7 +17,7 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Orders" version="7.0"> 
+                <form string="Point of Sale Orders" version="7.0">
                     <div class="oe_form_topbar">
                         <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
                         <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
@@ -27,7 +28,7 @@
                                 <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                             </div>
                     </div>
-                    <sheet> 
+                    <sheet>
                     <group col="4" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -748,10 +749,15 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!--
+            right now it's not possible to directly call a client action
+            from a menuitem, so we can't use this shortcut element and
+            use an explicit record element instead
+        -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
-          <field name="name">Point of Sale</field>
-          <field name="sequence" eval="21"/>
-          <field name="action" ref="action_pos_pos"/>
+            <field name="name">Point of Sale</field>
+            <field name="sequence">160</field>
+            <field name="action" ref="action_pos_pos"/>
         </record>
 
         <!-- use menuitem to add web_icon and web_icon_hover above -->
@@ -842,12 +848,12 @@
         </record>
 
 
-        <act_window 
-            id="act_pos_config_sessions" 
+        <act_window
+            id="act_pos_config_sessions"
             name="Sessions"
             src_model="pos.config"
             res_model="pos.session"
-            domain="[('config_id', '=', active_id)]" />         
+            domain="[('config_id', '=', active_id)]" />
 
         <record model="ir.actions.act_window" id="action_pos_config_pos">
             <field name="name">Point of Sales</field>
@@ -864,8 +870,8 @@
             id="menu_pos_config_pos"
             groups="group_pos_manager"/>
 
-        <act_window 
-            id="act_pos_session_orders" 
+        <act_window
+            id="act_pos_session_orders"
             name="Orders"
             src_model="pos.session"
             res_model="pos.order"
@@ -878,10 +884,10 @@
             <field name="model">pos.session</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Point of Sale Session" version="7.0">  
+                <form string="Point of Sale Session" version="7.0">
                     <header>
-                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" /> 
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" /> 
+                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" />
+                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened" />
                         <button name="close" type="workflow" string="Validate &amp; Close" states="closing_control,opened" />
 
                         <div class="oe_right">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26814892775..145af6f34ad 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
 
-        <menuitem
+        <menuitem name="Project"
             icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
+            sequence="90"
             groups="group_project_manager,group_project_user"
             web_icon="images/project.png"
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        
+
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
@@ -157,7 +157,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
-                       <field name="complete_name" string="Project Name"/> 
+                       <field name="complete_name" string="Project Name"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
@@ -545,7 +545,7 @@
                                                     ,[5, (hours gte 5 and hours lt 10)]
                                                     ,[10, (hours gte 10)]
                                                 ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
+                                                <t t-foreach="times" t-as="time"><a
                                                     t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
                                                     t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
@@ -652,7 +652,7 @@
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
                         <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                             help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="project_id"/>
@@ -675,7 +675,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="analytic_account_inherited_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.inherit</field>
             <field name="model">account.analytic.account</field>
@@ -827,5 +827,6 @@
 
       <!--     User Form-->
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 100c60e3f53..144ee741cb5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
            groups="group_purchase_manager,group_purchase_user"
            web_icon="images/purchases.png"
            web_icon_hover="images/purchases-hover.png"/>
@@ -222,7 +222,7 @@
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
 				    <label for="amount_total"/>
-                                    <button name="button_dummy" 
+                                    <button name="button_dummy"
 				    	states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
 			        <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..c1a8ea22d8b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
@@ -197,7 +197,7 @@
                                         <group>
                                             <field name="product_id"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                groups="base.group_user" 
+                                                groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 432b3ce365b..38b5d677c6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="5"
+                  groups="group_stock_manager,group_stock_user" sequence="50"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
@@ -123,7 +123,7 @@
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name"  /> 
+                            <label for="name"  />
                         </div>
                         <h1>
                             <field name="name" placeholder="Annual inventory"/>
@@ -1238,9 +1238,9 @@
                             </div>
                             <label for="product_uso_qty" />
                             <div>
-                                <field name="product_uos_qty" 
-                                    groups="product.group_uos" 
-                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                <field name="product_uos_qty"
+                                    groups="product.group_uos"
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
                                     class="oe_inline"/>
                                 <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
                             </div>
@@ -1419,7 +1419,7 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 20f6f42a929..fb4b232f512 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager"
-                 parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
-            <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" sequence="6"/>
-            <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
+        <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Define Surveys" id="menu_define_survey"
+             groups="base.group_tool_manager"
+             parent="menu_surveys" />
+        <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
+        <menuitem name="Reporting" parent="base.menu_tools"
+            id="base.menu_lunch_reporting" sequence="6"/>
+        <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
+
         <!--
             Survey
         -->
@@ -269,7 +271,7 @@
             </field>
         </record>
 
-       <record id="survey_search" model="ir.ui.view">
+        <record id="survey_search" model="ir.ui.view">
             <field name="name">survey_search</field>
             <field name="model">survey</field>
             <field name="type">search</field>
@@ -295,7 +297,7 @@
                </search>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_survey_kanban">
             <field name="name">event.survey.kanban</field>
             <field name="model">survey</field>
@@ -750,7 +752,7 @@
             </field>
         </record>
 
-       <record id="survey_question_search" model="ir.ui.view">
+        <record id="survey_question_search" model="ir.ui.view">
             <field name="name">survey_question_search</field>
             <field name="model">survey.question</field>
             <field name="type">search</field>

From bed5bf4804480c0b38d9fccef855db2b292e8025 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 19:30:02 +0200
Subject: [PATCH 278/397] improved task kanban view

bzr revid: mit@openerp.com-20120717173002-0m3f3uicefpmcu2l
---
 addons/project/project_view.xml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9e4f3c44a27..a70bc504299 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -517,22 +517,16 @@
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">i</span>
+                                <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
+
                             <div class="oe_kanban_content">
-                                <div>
-                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                    <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                    <b><field name="name"/></b>
-                                </div>
-                                <div>
-                                    <field name="partner_id"/>
-                                </div>
+                                <div><b><field name="name"/></b></div>
                                 <div>
                                     <field name="project_id"/>
                                     <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
@@ -551,13 +545,14 @@
                                                 <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                     </span>
                                 </div>
-                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_right">
-                                        <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                    </div>
+
+                                <div class="oe_kanban_bottom_right">
+                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
+                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>

From 005f7a3180f03ee03075cb7e5bb46910a8994644 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 17 Jul 2012 19:30:27 +0200
Subject: [PATCH 279/397] improved task kanban view

bzr revid: mit@openerp.com-20120717173027-tnpri7yd1jclnufs
---
 addons/web_kanban/static/src/css/kanban.css  | 11 +++++++----
 addons/web_kanban/static/src/css/kanban.sass |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 868fa9783fd..36dbab57559 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -402,16 +402,19 @@
   top: 2px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
+  position: relative;
+  top: 4px;
   display: inline-block;
   height: 12px;
   width: 12px;
-  margin: 4px auto;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
   border-radius: 6px;
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
 }
 .openerp .oe_kanban_view .oe_kanban_status_green {
   background: green;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index fb5bdc9dcbb..f4c13cc7bd2 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -338,12 +338,13 @@
         top: 2px
        
     .oe_kanban_status
+        position: relative
+        top: 4px
         display: inline-block
         height: 12px
         width: 12px
-        margin: 4px auto
         @include radius(6px)
-        @include box-shadow(0 1px 3px rgba(0,0,0,0.6))
+        @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%))
     .oe_kanban_status_green
         background: green
         @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))

From afd02c77dc20cfcbfe23c5d8edeeb1c6f11dbb75 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 18 Jul 2012 12:24:44 +0530
Subject: [PATCH 280/397] [FIX]: Payment_rate_Currency_id field in
 account_voucher

bzr revid: atp@tinyerp.com-20120718065444-d13waj4x9x0quin3
---
 addons/account_voucher/account_voucher_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 09fe0d23842..552e2e5a1f0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -52,6 +52,7 @@
                   <sheet string="Accounting Voucher">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="payment_rate_currency_id" invisible="1"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>

From 9113f5da36dc72fbc473e4facb9ed39b6fdacaab Mon Sep 17 00:00:00 2001
From: "Twinkle Christian (OpenERP)" <tch@tinyerp.com>
Date: Wed, 18 Jul 2012 13:10:40 +0530
Subject: [PATCH 281/397] [IMP]improving summary

bzr revid: tch@tinyerp.com-20120718074040-eghe7nrbhq39780y
---
 addons/crm/__openerp__.py                | 2 +-
 addons/hr_expense/__openerp__.py         | 2 +-
 addons/hr_holidays/__openerp__.py        | 2 +-
 addons/hr_timesheet_sheet/__openerp__.py | 2 +-
 addons/point_of_sale/__openerp__.py      | 2 +-
 addons/purchase/__openerp__.py           | 2 +-
 addons/sale/__openerp__.py               | 2 +-
 addons/stock/__openerp__.py              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e9e5337ed83..65a1461a5a4 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     "sequence": 2,
-    "summary": "Agenda, Lead, Opportunities",
+    "summary": "Agenda, Leads, Opportunities",
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 173b31e4b4e..c40670508f4 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 30,
-    "summary": "Expense Validation, Invoicing",
+    "summary": "Expenses Validation, Invoicing",
     'description': """
 This module aims to manage employee's expenses.
 ===============================================
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 9219dd92ed7..d1559dedec1 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,7 +26,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
-    "summary": "Allocation and Leaves Request, Reporting by Department",
+    "summary": "Allocation and Leaves Requests, Reporting by Department",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leaves' requests.
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 023cb401c63..04be6045f4d 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 16,
-    "summary": "Attendance, Activities, Timing",
+    "summary": "Attendances, Activities, Timing",
     'description': """
 This module helps you to easily encode and validate timesheet and attendances within the same view.
 ===================================================================================================
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index f13abc4b035..f3a10eec8ed 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     "sequence": 6,
-    "summary": "Touchscreen Sales",
+    "summary": "Touchscreen to manage you shop",
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 298c743d660..1f32f3a3145 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Purchase Management',
     "sequence": 19,
-    "summary": "Request for Quotation, Invoicing Control",
+    "summary": "Requests for Quotation, Invoicing Control",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
 =========================================================================================
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d02b6278cbe..f28a0518669 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Sales Management',
     "sequence": 14,
-    "summary": "Quotation, Sales, Invoicing",
+    "summary": "Quotations, Sales, Invoicing",
     'description': """
 The base module to manage quotations and sales orders.
 ======================================================
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 467ba05c2a2..2eaaa1ffb69 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Warehouse Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "summary": "Incoming Shipment, Deliveries, Inventory, Stock",
+    "summary": "Incoming Shipments, Deliveries, Inventory, Stock",
     "description" : """
 OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 ======================================================================================================

From 6a2f418bfd3662fc405839ea73c718d3f3754d88 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:12 +0200
Subject: [PATCH 282/397] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
---
 addons/association/profile_association.xml  | 10 ++++++----
 addons/membership/membership_data.xml       |  8 ++++----
 addons/membership/membership_view.xml       |  2 +-
 addons/point_of_sale/point_of_sale_view.xml | 12 ++++++++----
 addons/purchase/purchase_view.xml           | 15 ++++++++++-----
 addons/sale/sale_view.xml                   |  9 ++++++++-
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index f131fe4f4a9..3936824972b 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            name="Association"
+
+        <!-- Top menu item -->
+        <menuitem name="Association"
             id="base.menu_association"
             icon="terp-calendar"
-            sequence="9"
             web_icon="images/association.png"
-            web_icon_hover="images/association-hover.png"/>
+            web_icon_hover="images/association-hover.png"
+            sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
+
     </data>
 </openerp>
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
index 60c21fc6cf6..14fbb00f9a2 100644
--- a/addons/membership/membership_data.xml
+++ b/addons/membership/membership_data.xml
@@ -5,10 +5,10 @@
     <!--
     Price type
     -->
-        <record model="product.price.type" id="product_price_type_memberprice" >
-            <field name="name">Member Price</field>
-            <field name="field">member_price</field>
-        </record>
+    <record model="product.price.type" id="product_price_type_memberprice" >
+        <field name="name">Member Price</field>
+        <field name="field">member_price</field>
+    </record>
 
     <!--
     Price list
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6a421130544..5eea7170367 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -131,7 +131,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="70"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 7f99599a04b..27fc6bb8637 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -2,11 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem name="PoS Backend" id="menu_point_root" sequence="20"
+        <!-- Top menu item -->
+        <menuitem name="PoS Backend"
+            id="menu_point_root"
             icon="terp-partner"
-            groups="group_pos_manager"
             web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"/>
+            web_icon_hover="images/pos-hover.png"
+            groups="group_pos_manager"
+            sequence="140"/>
 
         <record id="categ_others" model="pos.category">
             <field name="name">Others</field>
@@ -749,6 +752,7 @@
             <field name="tag">pos.ui</field>
         </record>
 
+        <!-- Top menu item -->
         <!--
             right now it's not possible to directly call a client action
             from a menuitem, so we can't use this shortcut element and
@@ -756,7 +760,7 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">160</field>
+            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 144ee741cb5..45728729719 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="40"
-           groups="group_purchase_manager,group_purchase_user"
-           web_icon="images/purchases.png"
-           web_icon_hover="images/purchases-hover.png"/>
-       <menuitem id="menu_procurement_management" name="Purchase"
+
+        <!-- Top menu item -->
+        <menuitem name="Purchases"
+            id="base.menu_purchase_root"
+            icon="terp-purchase"
+            web_icon="images/purchases.png"
+            web_icon_hover="images/purchases-hover.png"
+            groups="group_purchase_manager,group_purchase_user"
+            sequence="40"/>
+        <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
 
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c1a8ea22d8b..37b68a47ef7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="30" groups="base.group_sale_salesman,base.group_sale_manager"/>
+
+        <!-- Top menu item -->
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            icon="terp-partner"
+            groups="base.group_sale_salesman,base.group_sale_manager"
+            sequence="30"/>
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 

From c11281fddd42101951980250022d5329771cfa77 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:11:17 +0200
Subject: [PATCH 283/397] [FIX] l10n_be_invoice_bba: fixed the algorithm
 missing argument correctly

bzr revid: qdp-launchpad@openerp.com-20120718101117-oekq03q72j90avp0
---
 addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 +--
 addons/l10n_be_invoice_bba/invoice.py               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 2d3ebbd4cd2..924cc0fcd48 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -11,9 +11,8 @@
       <field name="arch" type="xml">
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
-              <!-- "algorithm" not a field in any account related module.so pass it as False argument in generate_bbacomm() function. -->
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, False, partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 0cf55e5be64..93f9f22b1fa 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -85,7 +85,7 @@ class account_invoice(osv.osv):
         }
         result['value'].update(res_update)
         return result                    
-#algorithm is not defined as field in any account related modules.so pass it as false argument.
+
     def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
         partner_obj =  self.pool.get('res.partner')
         reference = reference or ''  

From dbd2f400a60512471e96914c5a45a48dacc7887a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:29 +0200
Subject: [PATCH 284/397] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101129-2l8yyzx4wu34yggr
---
 openerp/addons/base/base_menu.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 6c8055ff8d4..770e0e2d329 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -2,11 +2,18 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Reporting"
+            id="menu_reporting"
+            groups="base.group_user"
+            sequence="170"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
 
-        <menuitem id="menu_administration" name="Settings" sequence="180"/>
+        <!-- Top menu item -->
+        <menuitem name="Settings"
+            id="menu_administration"
+            sequence="500"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>

From e4c1ca04a11db2da818cbec650b241f6febbc674 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:13:39 +0200
Subject: [PATCH 285/397] [FIX] account: date_stop is required on
 account.period, there is no need to check if it's filled\!

bzr revid: qdp-launchpad@openerp.com-20120718101339-qe7sfe5ql370fn8j
---
 addons/account/account_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e1cf268115b..8ed796eebd7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -107,10 +107,9 @@
 		                    <group>
 		                        <field name="name"/>
 		                        <field name="fiscalyear_id" widget="selection"/>
-		                        <label for="date_start" string="Duration" />
+		                        <label for="date_start" string="Duration"/>
 		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> 
-		                            <span attrs="{'invisible': [('date_stop','=',False)]}"> - </span> 
+		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>

From 0f74f43fdf3372adc582f559a9dc787402371f12 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:15:07 +0200
Subject: [PATCH 286/397] [FIX] account: bad merge had duplicated some fields\!

bzr revid: qdp-launchpad@openerp.com-20120718101507-lj66v0k3lm2tt5av
---
 addons/account/account_view.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8ed796eebd7..0172fa7429a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -627,13 +627,8 @@
                     </div>
                     <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>-
-                        <field name="period_id" class="oe_inline"/>
+                        <field name="name" class="oe_inline"/>
                     </h1>
-                    <label for="journal_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>                        
-                    </h2>
                     <group>
                         <group>
                             <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
@@ -642,7 +637,6 @@
                                 <field name="date" on_change="onchange_date(date, company_id)" class="oe_inline"/>
                                 <field name="period_id" class="oe_inline"/>
                             </div>
-                            <field name="name"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group><group>
                             <label for="balance_start"/>
@@ -1130,7 +1124,7 @@
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
 	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note."/>
+	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
 	                        </page>
 	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
 	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -1441,7 +1435,7 @@
                                     <field name="reconcile_partial_id"/>
                                 </tree>
                             </field>
-                            <field name="narration" colspan="4" placeholder="Add an internal note." nolabel="1" height="50"/>
+                            <field name="narration" colspan="4" placeholder="Add an internal note..." nolabel="1" height="50"/>
                         </page>
                     </notebook>
                     </sheet>

From 87d0d213ea061e90f041993eea5bec138763f808 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:16:26 +0200
Subject: [PATCH 287/397] [FIX] account: bad parameters during string
 formatting\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101626-4h0z8qyq8mx1jg5h
---
 addons/account/wizard/account_move_journal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 5986bfc3bd3..66f634bd59f 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -115,7 +115,7 @@ class account_move_journal(osv.osv_memory):
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </footer>
-            </form>""" % (journal_string, period_string, open_string)
+            </form>""" % (_('Journal'), journal_string, _('Period'), period_string, open_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)

From aad9ce6416a96c8368def382c4ec96aec77a53aa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 12:17:29 +0200
Subject: [PATCH 288/397] [IMP] added possibility to only highlight the first
 line in read only m2o

bzr revid: nicolas.vanhoren@openerp.com-20120718101729-k1rxexdzozy5cx5i
---
 addons/web/static/src/js/view_form.js | 15 +++++++++++++--
 addons/web/static/src/xml/base.xml    |  5 ++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3f389d3d41f..2e404a6bfdd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2739,10 +2739,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             this.$input.val(str.split("\n")[0]);
             this.current_display = this.$input.val();
         } else {
-            str = _.escape(str).split("\n").join("<br />");
+            var lines = _.escape(str).split("\n");
+            var link = "";
+            var follow = "";
+            if (! this.get_definition_options().highlight_first_line) {
+                link = lines.join("<br />");
+            } else {
+                link = lines[0];
+                follow = _.rest(lines).join("<br />");
+                if (follow)
+                    link += "<br />";
+            }
             this.$element.find('a')
                  .unbind('click')
-                 .html(str)
+                 .html(link)
                  .click(function () {
                     self.do_action({
                         type: 'ir.actions.act_window',
@@ -2754,6 +2764,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                     });
                     return false;
                  });
+            $(".oe_form_m2o_follow").html(follow);
         }
     },
     set_value: function(value_) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 70b0cd85cc5..3389e016486 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -943,7 +943,10 @@
 </t>
 <t t-name="FieldMany2One">
     <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
-        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
+        <t t-if="widget.get('effective_readonly')">
+            <a href="#" class="oe_form_uri"/>
+            <span class="oe_form_m2o_follow"/>
+        </t>
         <t t-if="!widget.get('effective_readonly')">
             <button class="oe_button oe_m2o_cm_button" title="Open Resource">
                 <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>

From 674104d3fbaf257b87d87da6a24bdbd25dbd6ce3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:17:42 +0200
Subject: [PATCH 289/397] [FIX] account_asset: bad context handling\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101742-in5xt5k7uz3hmecb
---
 addons/account_asset/account_asset.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 61d2ce89ac9..2e9df0b5693 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -318,13 +318,16 @@ class account_asset_asset(osv.osv):
         return asset_id
     
     def open_entries(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        context.update({'search_default_asset_id': ids, 'default_asset_id': ids})
         return {
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'account.move.line',
             'view_id': False,
             'type': 'ir.actions.act_window',
-            'context':{'search_default_asset_id': ids, 'default_asset_id': ids},
+            'context': context,
         }
 
 account_asset_asset()

From 305ee2dc0891a4e8f8b2a7faa421f9f709575a00 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:18:05 +0200
Subject: [PATCH 290/397] [FIX] account_asset: typo\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101805-qcpiyvh5frgh9mqe
---
 addons/account_asset/account_asset_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index dadc9edcf81..90c4db33ac6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -70,7 +70,7 @@
             </search>
         </field>
     </record>
-    
+
     <!--
         Asset
      -->
@@ -145,7 +145,7 @@
                                     <field name="parent_state" invisible="1"/>
                                     <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
                                 </tree>
-                                <form string="Depriciation Lines"> 
+                                <form string="Depreciation Lines"> 
                                     <group>
                                         <group>
                                             <field name="asset_id" invisible="1"/>
@@ -184,7 +184,7 @@
             </form>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_account_asset_asset_tree">
         <field name="name">account.asset.asset.tree</field>
         <field name="model">account.asset.asset</field>

From 0d1aa39f36c987678276da4129b8cd55eee6f19d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 12:18:09 +0200
Subject: [PATCH 291/397] [IMP] cosmetic change in sale order view

bzr revid: nicolas.vanhoren@openerp.com-20120718101809-w0os8ywew5yw6ntq
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7420edb910..619ea161f28 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -171,7 +171,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
 

From d9f2652e37f54dadd462dfcf4f5a2d09261658e1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:19:23 +0200
Subject: [PATCH 292/397] [FIX] account_budget: date_stop is required on budget
 and budget lines, there is no need to check if it's filled\!\!\!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718101923-rq7392ya0qudqpaf
---
 addons/account_budget/account_budget_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 16f13881034..3ab8a23c6ee 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -119,16 +119,15 @@
                     <sheet string="Budget">
                         <group>
                             <group>
-                                <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group>
-                                <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="code" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <label for="date_from" string="Duration"/>
                                 <div>
-                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span> 
+                                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/> - 
                                     <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
                                 </div>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -156,8 +155,7 @@
                                                 <field name="planned_amount"/>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
-                                                    <field name="date_from" class="oe_inline"/>
-                                                    <span  attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
+                                                    <field name="date_from" class="oe_inline"/> - 
                                                     <field name="date_to" class="oe_inline"/>
                                                 </div>
                                             </group>

From 3bd0b83f601039e27f18701d39b208783109ee7a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:20:29 +0200
Subject: [PATCH 293/397] [REV] account_check_writing: why should define a NEW
 form view of voucher AGAIN??\!

bzr revid: qdp-launchpad@openerp.com-20120718102029-nbvg98ojon60e12f
---
 .../account_voucher_view.xml                  | 138 ++----------------
 1 file changed, 13 insertions(+), 125 deletions(-)

diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 9fafdcd30c3..07d73188db8 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -8,132 +8,20 @@
             <field name="name">account.voucher.payment.check.form</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
-                <form version="7.0">
-	                <header>
-	                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
-	                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
-	                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-	                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-	                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-	                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-	                </header>
-	                <sheet string="Bill Payment">
-	                    <group> 
-	                        <group>
-	                            <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-	                            <label for="amount" string="Total"/>
-	                            <div>
-	                                <field name="amount" class="oe_inline" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> -
-	                                <field name="amount_in_word" class="oe_inline" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="1"/> 
-	                            </div>
-	                            <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-	                        </group>
-	                        <group>
-	                            <field name="journal_id"
-	                             domain="[('type','in',['bank', 'cash'])]"
-	                             invisible="context.get('line_type', False)"
-	                             widget="selection"
-	                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
-	                             string="Payment Method"/>
-	                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
-	                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
-	                            <field name="allow_check" invisible="1"/>
-	                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                            <field name="account_id"
-	                             widget="selection"
-	                             invisible="True"/>
-	                            <field name="pre_line" invisible="1"/>
-	                            <field name="type" invisible="True"/>
-	                            <field name="currency_id" invisible="1" colspan="4"/>
-	                        </group>
-	                    </group>
-	                    <notebook>
-	                        <page string="Payment Information">
-	                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-	                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
-	                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
-	                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
-	                                        on_change="onchange_move_line_id(move_line_id)"
-	                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-	                                        required="1"
-	                                        />
-	                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
-	                                    <field name="date_original" readonly="1"/>
-	                                    <field name="date_due" readonly="1"/>
-	                                    <field name="amount_original" readonly="1"/>
-	                                    <field name="amount_unreconciled" readonly="1"/>
-	                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
-	                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
-	                                </tree>
-	                            </field>
-	                            <group col="3">
-	                                <group>
-	                                    <field name="narration"  placeholder="Add an internal note." nolabel="1"/>
-	                                </group>
-                                    <group  string="Currency Options" col="5" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                        <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" 
-                                            on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)"/>
-                                        <field name="payment_rate_currency_id" nolabel="1" 
-                                            on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
-                                        <field name="paid_amount_in_company_currency" invisible="1"/>
-                                    </group>
-                                    <group string="Payment Options">
-                                        <field name="writeoff_amount"/>
-                                        <field name="payment_option" required="1"/>
-                                        <field name="writeoff_acc_id"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                               domain="[('type','=','other')]"/>
-                                        <field name="comment"
-                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                        <field name="analytic_id"
-                                               groups="analytic.group_analytic_accounting"/>
-                                    </group>
-	                            </group>
-	                        </page>
-	                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-	                            <group>
-	                                <field name="period_id"/>
-	                                <field name="audit"/>
-	                                <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
-	                            </group>
-	                            <field name="move_ids" readonly="1">
-	                                <tree string="Journal Items">
-	                                    <field name="move_id"/>
-	                                    <field name="ref"/>
-	                                    <field name="date"/>
-	                                    <field name="statement_id"/>
-	                                    <field name="partner_id"/>
-	                                    <field name="account_id"/>
-	                                    <field name="name"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="state"/>
-	                                    <field name="reconcile_id"/>
-	                                    <field name="amount_currency"/>
-	                                    <field name="currency_id"/>
-	                                </tree>
-	                            </field>
-	                        </page>
-	                    </notebook>
-	                </sheet>
-                </form>
+                <field name="journal_id" position="after">
+                    <newline/>
+                    <field name="allow_check" invisible="1"/>
+                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
+                    <newline/>
+                </field>
+                <field name="number" position="replace">
+                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                </field>
+                <button name="proforma_voucher" position="after">
+                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
+                </button>
             </field>
         </record>
 

From 803220f3b7c893824cecb09763155a99436a1524 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 12:21:09 +0200
Subject: [PATCH 294/397] [IMP] account: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718102109-prtl3sb28xehgnlh
---
 addons/account/account_view.xml                      | 7 ++++---
 addons/account/wizard/account_chart_view.xml         | 5 ++---
 addons/account/wizard/account_report_common_view.xml | 2 +-
 addons/account/wizard/account_use_model_view.xml     | 4 ++--
 addons/account_voucher/account_voucher_view.xml      | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0172fa7429a..ecdcdaf4924 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2603,20 +2603,21 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 </header>
                 <sheet string="Statement">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+                    <h1><field name="name" class="oe_inline"/></h1>
                     <label for="journal_id" class="oe_edit_only"/>
                     <h2>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>	
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                     </h2>
                     <group>
                         <group>
                             <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
-                            <field name='company_id' widget="selection" groups="base.group_multi_company" />     
+                            <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>
                             <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
                             <field name="closing_date" readonly="1"/>
+                            <field name="period_id" class="oe_inline"/>
                             <field name="currency" invisible="1"/>
                         </group>
                     </group>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index fbb509a52e3..553d83fa01c 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,7 +16,7 @@
                         <field name="target_move"/>
                         <label for="period_from" string="Periods"/>
                         <div>
-                            <field name="period_from" class="oe_inline"/>-
+                            <field name="period_from" class="oe_inline"/> - 
                             <field name="period_to" class="oe_inline"/>
                         </div>
                     </group>
@@ -30,7 +30,7 @@
         </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
-            <field name="name">Select an Accounting Setup</field>
+            <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -41,7 +41,6 @@
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
             id="menu_action_account_tree2"
-            name="Chart of Accounts"
             parent="account.menu_finance_charts" />
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index aa09e7fd3a8..18953270e09 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -26,7 +26,7 @@
                         </group>
                         <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}">
                             <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  />
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index b128292271c..6170ca4fe12 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,8 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <group string="Create Entries From Models">
-	                    <field name="model" nolabel="1"/>
+	                <group>
+	                    <field name="model"/>
 	                </group>
 	                <footer>
 	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 552e2e5a1f0..d1912a58d1c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -118,7 +118,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_voucher_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>

From c7f4b5ead1edbd30cd0c43fc3fec8c45327e452a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:34:29 +0200
Subject: [PATCH 295/397] [IMP] format all the top menu items' XML the same
 way, prefixed by the comment '<- Top menu item -->', making them easier to
 spot also fix some identation

bzr revid: abo@openerp.com-20120718103429-98gl4oe0hkmmf35k
---
 addons/account/account_menuitem.xml | 11 ++++--
 addons/base_tools/tools_view.xml    | 11 +++---
 addons/event/event_view.xml         |  5 ++-
 addons/hr/hr_view.xml               |  8 +++--
 addons/knowledge/knowledge_view.xml | 24 ++++++++-----
 addons/mail/mail_thread_view.xml    | 13 ++++---
 addons/marketing/marketing_view.xml |  9 ++---
 addons/mrp/mrp_view.xml             | 15 +++++---
 addons/project/project_view.xml     | 54 +++++++++++++++--------------
 addons/purchase/stock_view.xml      |  8 ++---
 addons/sale/sale_view.xml           |  1 +
 addons/stock/stock_view.xml         | 13 ++++---
 12 files changed, 106 insertions(+), 66 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 401f77c9f94..69c4f3a7307 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="100"
-            groups="group_account_user,group_account_manager,group_account_invoice"
+        <!-- Top menu item -->
+        <menuitem name="Invoicing"
+            id="menu_finance"
+            icon="terp-account"
             web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"/>
+            web_icon_hover="images/accounting-hover.png"
+            groups="group_account_user,group_account_manager,group_account_invoice"
+            sequence="100"/>
+
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 0541e452620..3002931cf17 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -2,10 +2,13 @@
 <openerp>
     <data>
 
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools"
-                    name="Tools" sequence="160"
-                    web_icon="images/tools.png"
-                    web_icon_hover="images/tools-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Tools"
+            id="base.menu_tools"
+            icon="STOCK_PREFERENCES"
+            web_icon="images/tools.png"
+            web_icon_hover="images/tools-hover.png"
+            sequence="160"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 11e2322a0d8..890cb1be9e6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -10,7 +10,10 @@
             context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
 
-        <menuitem name="Events" id="event_main_menu" sequence="80"/>
+        <!-- Top menu item -->
+        <menuitem name="Events"
+            id="event_main_menu"
+            sequence="80"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
 
         <!-- EVENTS  -->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6e798449fba..521ebafdd97 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,10 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="110"
+        <!-- Top menu item -->
+        <menuitem name="Human Resources"
+            id="menu_hr_root"
+            icon="terp-hr"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"
-            groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
+            groups="base.group_hr_manager,base.group_hr_user,base.group_user"
+            sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index b2eefd90cce..5f36ad110c6 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,13 +1,19 @@
 <openerp>
-<data>
-    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="130" groups="base.group_system,base.group_document_user"
-              web_icon="images/knowledge.png"
-              web_icon_hover="images/knowledge-hover.png"/>
-    <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+    <data>
 
-    <menuitem id="knowledge.menu_document2" name="Collaborative Content"
-       parent="knowledge.menu_document" />
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            icon="terp-stock"
+            web_icon="images/knowledge.png"
+            web_icon_hover="images/knowledge-hover.png"
+            groups="base.group_system,base.group_document_user"
+            sequence="130"/>
 
-</data>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+           parent="knowledge.menu_document"/>
+
+    </data>
 </openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f15141d3711..06cb8189915 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -2,11 +2,13 @@
 <openerp>
     <data>
 
-        <!-- toplevel menu -->
-        <menuitem id="mail_feeds_main" name="Feeds" sequence="10"
-            web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png"
-            groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Feeds"
+          id="mail_feeds_main"
+          web_icon="static/src/img/feeds.png"
+          web_icon_hover="static/src/img/feeds-hover.png"
+          groups="base.group_user"
+          sequence="10"/>
 
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
@@ -22,5 +24,6 @@
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index e9ee0a11e97..d478b9f6479 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,13 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Marketing"
-            icon="terp-crm"
             id="base.marketing_menu"
-            sequence="120"
-            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            icon="terp-crm"
             web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"/>
+            web_icon_hover="images/marketing-hover.png"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            sequence="120"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ac6c82f6642..72cd8b5c1ff 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -2,12 +2,19 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="60"
+        <!-- Top menu item -->
+        <menuitem name="Manufacturing"
+            id="base.menu_mrp_root"
+            icon="terp-mrp"
             web_icon="images/manufacturing.png"
-            web_icon_hover="images/manufacturing-hover.png"/>
+            web_icon_hover="images/manufacturing-hover.png"
+            groups="group_mrp_user,group_mrp_manager"
+            sequence="60"/>
 
-        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem name="Manufacturing"
+            id="menu_mrp_manufacturing"
+            parent="base.menu_mrp_root"
+            sequence="1"/>
 
         <menuitem name="Master Data"
             id="menu_mrp_bom"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 145af6f34ad..9edd731acf2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,12 +2,14 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
         <menuitem name="Project"
-            icon="terp-project" id="base.menu_main_pm"
-            sequence="90"
-            groups="group_project_manager,group_project_user"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            groups="group_project_manager,group_project_user"
+            sequence="90"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
@@ -156,31 +158,31 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                   <group>
-                       <field name="complete_name" string="Project Name"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-mail-message-new"
+                    <group>
+                        <field name="complete_name" string="Project Name"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-mail-message-new"
                            string="Inbox" help="Unread messages"
                            name="needaction_pending"
                            domain="[('needaction_pending','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
-                       <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
-                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       <separator orientation="vertical"/>
-                       <field name="user_id" string="Project Manager"/>
-                       <field name="partner_id" string="Partner"/>
-                   </group>
-                   <newline />
-                   <group expand="0" string="Group By...">
-                       <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                       <separator orientation="vertical"/>
-                       <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                   </group>
-               </search>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
+                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
+                        <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
+                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                        <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Project Manager"/>
+                        <field name="partner_id" string="Partner"/>
+                    </group>
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index f9d6239e0a5..d96d9124e0b 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,7 +11,7 @@
                     <field name="purchase_line_id" colspan="2" />
                 </xpath>
             </field>
-        </record>      
+        </record>
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
@@ -35,7 +35,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <!-- Picking to Invoice -->
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
@@ -86,7 +86,7 @@
             <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
         </record>
-        
+
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
@@ -102,7 +102,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 37b68a47ef7..62145ad064b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -8,6 +8,7 @@
             icon="terp-partner"
             groups="base.group_sale_salesman,base.group_sale_manager"
             sequence="30"/>
+
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 38b5d677c6b..b8cda122e6b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,10 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
-                  groups="group_stock_manager,group_stock_user" sequence="50"
-                  web_icon="images/warehouse.png"
-                  web_icon_hover="images/warehouse-hover.png"/>
+        <!-- Top menu item -->
+        <menuitem name="Warehouse"
+            id="menu_stock_root"
+            icon="terp-stock"
+            web_icon="images/warehouse.png"
+            web_icon_hover="images/warehouse-hover.png"
+            groups="group_stock_manager,group_stock_user"
+            sequence="50"/>
+
         <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>

From 91e97798dbb276ad24c4282ec193d44a2351c7c2 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 18 Jul 2012 16:35:01 +0530
Subject: [PATCH 296/397] [IMP] sale: make only confirm as red button on
 quotations

bzr revid: cha@tinyerp.com-20120718110501-js1le7i30vxwlwpm
---
 addons/sale/sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 619ea161f28..98607994dab 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -146,10 +146,10 @@
                             <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                             <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                             <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_highlight"/>
+                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent"/>
                             <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_highlight"/>
-                            <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
+                            <button name="print_quotation" string="Send by Post" type="object" states="draft,sent"/>
+                            <button name="action_button_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>

From b722ae5b827105582e31ce5724cbb10cdefbc572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Jul 2012 13:08:15 +0200
Subject: [PATCH 297/397] [IMP] mail: chatter: save template button not opening
 a new wizard anymore.

bzr revid: tde@openerp.com-20120718110815-hqlis1tdq27upbqn
---
 .../wizard/email_compose_message_view.xml     |  2 ++
 .../wizard/mail_compose_message.py            | 19 +------------------
 addons/mail/static/src/js/mail.js             |  5 +++++
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 2560767cd14..ce34ea1d551 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -51,8 +51,10 @@
                                 title='Use a message template'/>
                         </a> -->
                         <button icon="gtk-paste" type="object" name="template_toggle"
+                                class="oe_mail_compose_message_template_toggle"
                                 string="" help="Use a message template" />
                         <button icon="gtk-save" type="object" name="save_as_template"
+                                class="oe_mail_compose_message_template_save"
                                 string="" help="Save as a new template"/>
                     </xpath>
                 </data>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ec6bb5b4dde..15fbeff20b0 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -27,23 +27,6 @@ from tools.translate import _
 import tools
 
 
-def _reopen(self, id, 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, otherwise
-            # it will be lost on the action's context switch
-            'context': {'mail.compose.target.model': model,
-                        'active_id': res_id,
-                        'active_ids': [res_id],
-                        'active_model': model,
-                        }
-    }
-
 class mail_compose_message(osv.osv_memory):
     _inherit = 'mail.compose.message'
 
@@ -169,7 +152,7 @@ class mail_compose_message(osv.osv_memory):
                           'use_template': True})
 
         # _reopen same wizard screen with new template preselected
-        return _reopen(self, record.id, record.res_id, record.model)
+        return False
 
     # override the basic implementation 
     def render_template(self, cr, uid, template, model, res_id, context=None):
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 25c922964f7..3ee88fbc37d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -18,6 +18,8 @@ openerp.mail = function(session) {
 
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message') {
+                console.log(this);
+                // debugger
                 var record_thread = this.fields.message_ids;
                 var thread = record_thread.thread;
                 thread.instantiate_composition_form('comment', true, false, 0, action.context);
@@ -390,6 +392,9 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
+            this.$element.find('button.oe_form_button').click(function (event) {
+                event.preventDefault();
+            });
             // event: click on 'Send an Email' link that toggles the form for
             // sending an email (partner_ids)
             this.$element.find('a.oe_mail_compose_message_email').click(function (event) {

From 4cbee6dbed71862d8f7c76ce2db31c5c1fb6c1d1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 13:18:42 +0200
Subject: [PATCH 298/397] [FIX] put a missing <div> back in place

bzr revid: abo@openerp.com-20120718111842-o2q0dyuhbylhtvve
---
 addons/stock/stock_view.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e8c359e8196..77f4bc33147 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -15,7 +15,7 @@
         <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
-           parent="stock.menu_stock_product" sequence="0"/>
+            parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="40" groups="base.group_no_one"/>
@@ -29,15 +29,15 @@
         <menuitem
             action="product.product_ul_form_action" groups="product.group_stock_packaging"
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
-         <menuitem
+        <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
             parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
-         <menuitem
-             action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-             parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
-         <menuitem
-              action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-              parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
+        <menuitem
+            action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+            parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
+        <menuitem
+            action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+            parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -126,6 +126,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -

From d713f209543c35bcb1966e03d85a5cb2c44509ba Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 13:28:16 +0200
Subject: [PATCH 299/397] [FIX] point_of_sale: remove auto_install on module

bzr revid: rco@openerp.com-20120718112816-sby6j51xnevm0rzk
---
 addons/point_of_sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 5e7e5578f72..4c0bb14cc10 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -99,6 +99,6 @@ Main features :
         'static/src/css/keyboard.css'
     ],
     'qweb': ['static/src/xml/pos.xml'],
-    'auto_install': True,
+    'auto_install': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0ec54ee4731a20bebe5aca96a358a5e1739f0073 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 13:35:34 +0200
Subject: [PATCH 300/397] [FIX] add a missing name attribute to the user's form
 view 'view_users_form_simple_modif' this name attribute is used by a xpath in
 the point_of_sale module (cf. 'res_users_form_preference_view' view)

bzr revid: abo@openerp.com-20120718113534-g9kd95y75t2x71c0
---
 openerp/addons/base/res/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 4f8fb9f94fd..546c1c063b8 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -58,7 +58,7 @@
                             <field name="comment"/>
                         </page>
                     </notebook>
-                  </sheet>  
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -199,7 +199,7 @@
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)
                     </h1>
-                    <group col="4">
+                    <group name="preferences" col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From e824580c89e974f716723f7c1300504934259f4a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 18 Jul 2012 17:10:32 +0530
Subject: [PATCH 301/397] [IMP] account : Create the invoice and validate it.
 then send it, once it is sent, only the register payment button must be red.

bzr revid: mdi@tinyerp.com-20120718114032-hjn8v2evgqffn5gw
---
 addons/account/account_invoice_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 211a40f030f..40283d28df3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -292,8 +292,10 @@
                 <form version="7.0">
                 <header>
                     <span groups="base.group_user">
-                        <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
+                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
+                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
                         <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
                         <button name="invoice_open" states="proforma2" string="Validate"/>
                         <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>

From 80e504e2709e147862bac4a034980acb035782f9 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 18 Jul 2012 17:30:36 +0530
Subject: [PATCH 302/397] [IMP] account_voucher :  Journal and account should
 go in accountant group.

bzr revid: mdi@tinyerp.com-20120718120036-r2v5o6xu9pt37qaw
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index e70156e4032..a003e4ea986 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -95,7 +95,7 @@
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
-                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)" groups="account.group_account_user"/>
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
@@ -249,14 +249,15 @@
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"
-                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
+                                groups="account.group_account_user"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"  groups="account.group_account_user"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]" groups="account.group_account_user"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

From 38b6a92f0113f3c8eaee425b900c4190c1c93266 Mon Sep 17 00:00:00 2001
From: Kuldeep <th_dev2@openerp.co.in>
Date: Wed, 18 Jul 2012 17:48:17 +0530
Subject: [PATCH 303/397] [IMP] set name in xpath

bzr revid: th_dev2@openerp.co.in-20120718121817-le2288em9d23740w
---
 addons/account/partner_view.xml                |  2 +-
 addons/crm_claim/crm_claim_view.xml            |  6 +++---
 addons/event/res_partner_view.xml              | 10 +++++-----
 addons/marketing_campaign/res_partner_view.xml |  6 +++---
 addons/project/res_partner_view.xml            |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index a916a59c42a..53f556b77c2 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -77,7 +77,7 @@
                 <page string="History" position="before" version="7.0">
                 <page string="Accounting" col="4">
                     <group>
-                        <group >
+                        <group>
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0444479ee14..6317d53a1cc 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -254,10 +254,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Claim']" position="attributes">
+                <xpath expr="//group[@name='Claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +270,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@string='Claim']" position="inside">
+                    <xpath expr="//group[@name='Claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 478ffd0fb2e..007feb5ec02 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Event']" position="attributes">
+                <xpath expr="//group[@name='Event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Registration']" position="attributes">
+                <xpath expr="//group[@name='Registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group string="Event" position="inside">
+                <group name="Event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group string="Registration" position="inside">
+                   <group name="Registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index ee512f61049..b8ff13367d1 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -9,10 +9,10 @@
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Campaign']" position="attributes">
+                <xpath expr="//group[@name='Campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group string="Campaign" position="inside">
+                    <group name="Campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 1d4c63fc0ef..5d0544b78ef 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -9,10 +9,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='History']" position="attributes">
+                <xpath expr="//page[@name='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@string='Tasks']" position="attributes">
+                <xpath expr="//group[@name='Tasks']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +23,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group string="Tasks" position="inside">
+                   <group name="Tasks" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From 74a58c0f15a9163b0a8fdea3818071d6931a3326 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 18 Jul 2012 17:48:21 +0530
Subject: [PATCH 304/397] [IMP]vat to tax : I have changed the label as tax
 inplace of vat

bzr revid: rpr@tinyerp.com-20120718121821-esupnmy423ukxniz
---
 addons/account/account.py                     | 26 +++++++++----------
 addons/account/account_move_line.py           |  4 +--
 .../data/configurable_account_chart.xml       |  6 ++---
 addons/account/demo/account_minimal.xml       |  4 +--
 .../report/account_journal_sale_purchase.rml  |  6 ++---
 .../account/report/account_print_invoice.rml  |  2 +-
 .../account/report/account_print_overdue.rml  |  2 +-
 addons/account/wizard/account_vat_view.xml    |  4 +--
 .../account_coda/account_coda_comm_type.xml   |  2 +-
 .../account_coda_trans_category.xml           |  2 +-
 .../account_coda/account_coda_trans_code.xml  |  4 +--
 .../report/account_followup_print.rml         |  2 +-
 addons/l10n_th/account_data.xml               | 20 +++++++-------
 addons/l10n_us/account_tax_template.xml       |  2 +-
 addons/mrp_repair/report/order.rml            |  4 +--
 addons/point_of_sale/report/pos_lines.rml     |  2 +-
 addons/report_intrastat/report/invoice.rml    |  2 +-
 addons/sale/report/sale_order.rml             |  4 +--
 18 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6fd7232a25..78d0a192237 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1880,17 +1880,17 @@ class account_tax(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the VAT declaration
+        # Fields used for the TAX declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the VAT declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the VAT declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the TAX declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the TAX declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the VAT declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the TAX declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the TAX declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2217,7 +2217,7 @@ class account_tax(osv.osv):
     def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
-        Price Unit is a VAT included price
+        Price Unit is a TAX included price
 
         RETURN:
             [ tax ]
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2788,17 +2788,17 @@ class account_tax_template(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the VAT declaration
+        # Fields used for the TAX declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the VAT declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the VAT declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the TAX declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the TAX declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the VAT declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the TAX declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the TAX declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 57cc125bb5b..e9f3459ad2c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -327,7 +327,7 @@ class account_move_line(osv.osv):
 
         if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
             data['account_id'] = account.id
-            # Propose the price VAT excluded, the VAT will be added when confirming line
+            # Propose the price TAX excluded, the TAX will be added when confirming line
             if account.tax_ids:
                 taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
                 tax = tax_obj.browse(cr, uid, taxes)
@@ -1347,7 +1347,7 @@ class account_move_line(osv.osv):
                     }
                     if data['tax_code_id']:
                         self.create(cr, uid, data, context)
-                #create the VAT movement
+                #create the TAX movement
                 data = {
                     'move_id': vals['move_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 756866a3a50..345202de899 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -385,8 +385,8 @@
             <field name="complete_tax_set" eval="False"/>
         </record>
 
-         <!-- VAT Codes -->
-        <!-- Purchases + Output VAT -->
+         <!-- TAX Codes -->
+        <!-- Purchases + Output TAX -->
 
         <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
@@ -444,7 +444,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input VAT -->
+        <!-- Sales + Input TAX -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..3592c82d6f8 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -94,7 +94,7 @@
 
         <record id="ova" model="account.account">
             <field name="code">X11003</field>
-            <field name="name">Output VAT - (test)</field>
+            <field name="name">Output TAX - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_asset"/>
@@ -152,7 +152,7 @@
 
         <record id="iva" model="account.account">
             <field name="code">X1112</field>
-            <field name="name">Input VAT - (test)</field>
+            <field name="name">Input TAX - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_liability"/>
diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml
index 68f93b88294..69f26ce1ff8 100644
--- a/addons/account/report/account_journal_sale_purchase.rml
+++ b/addons/account/report/account_journal_sale_purchase.rml
@@ -219,7 +219,7 @@
             <td><para style="P10a">Account</para></td>
             <td><para style="P10a">Partner</para></td>
             <td><para style="P10a">Label</para></td>
-            <td><para style="P10a">VAT</para></td>
+            <td><para style="P10a">TAX</para></td>
             <td><para style="P11"></para></td>
             <td><para style="P10b">Debit</para></td>
             <td><para style="P10b">Credit</para></td>
@@ -271,7 +271,7 @@
         <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Label</para></td>
-        <td><para style="P10a">VAT</para></td>
+        <td><para style="P10a">TAX</para></td>
         <td><para style="P11"></para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
@@ -330,7 +330,7 @@
         <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1">
           <tr>
             <td><para style="P12"></para></td>
-            <td><para style="P12">VAT Declaration</para></td>
+            <td><para style="P12">TAX Declaration</para></td>
             <td><para style="P12"></para></td>
             <td><para style="P12"></para></td>
           </tr>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 4ffa7a33f9d..12192f8472b 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -168,7 +168,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 2d4238823da..6b4253d99f9 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -138,7 +138,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">VAT: [[ o.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TAX: [[ o.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 988c4786bb8..44dae7ec5ac 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a TAX declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a TAX declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/account_coda/account_coda_comm_type.xml
index 9a042ec48d2..4a1c74ca770 100644
--- a/addons/account_coda/account_coda_comm_type.xml
+++ b/addons/account_coda/account_coda_comm_type.xml
@@ -73,7 +73,7 @@
         </record>
         <record id="acct_106" model="account.coda.comm.type">
             <field name="code">106</field>
-            <field name="description">Method of calculation (VAT, withholding tax on income, commission, etc.)</field>
+            <field name="description">Method of calculation (TAX, withholding tax on income, commission, etc.)</field>
         </record>
         <record id="acct_107" model="account.coda.comm.type">
             <field name="code">107</field>
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/account_coda/account_coda_trans_category.xml
index 192240cf8aa..e2d46e017b4 100644
--- a/addons/account_coda/account_coda_trans_category.xml
+++ b/addons/account_coda/account_coda_trans_category.xml
@@ -49,7 +49,7 @@
         </record>
         <record id="actrca_011" model="account.coda.trans.category">
             <field name="category">011</field>
-            <field name="description">VAT</field>
+            <field name="description">TAX</field>
         </record>
         <record id="actrca_012" model="account.coda.trans.category">
             <field name="category">012</field>
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/account_coda/account_coda_trans_code.xml
index b2b23d59bef..4f4e0d9f3cf 100644
--- a/addons/account_coda/account_coda_trans_code.xml
+++ b/addons/account_coda/account_coda_trans_code.xml
@@ -382,7 +382,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_03"/>
             <field name="description">Reimbursement of cheque-related costs</field>
-            <field name="comment">Overall amount, VAT included</field>
+            <field name="comment">Overall amount, TAX included</field>
         </record>
         <record id="actcc_03_99" model="account.coda.trans.code">
             <field name="code">99</field>
@@ -1850,7 +1850,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_80"/>
             <field name="description">Miscellaneous fees and commissions</field>
-            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at least 3 articles)</field>
+            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). TAX excluded = type 0 TAX included = type 3 (at least 3 articles)</field>
         </record>
         <record id="actcc_80_35" model="account.coda.trans.code">
             <field name="code">35</field>
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 3d096ecf3ac..83fcfe0f24c 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -141,7 +141,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">VAT: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TAX: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index eebaffb92f0..53af51f40d4 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -125,7 +125,7 @@
 
 <record id="a_input_vat" model="account.account.template">
     <field name="code">1510</field>
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="parent_id" ref="a_assets"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -187,7 +187,7 @@
 
 <record id="a_output_vat" model="account.account.template">
     <field name="code">2310</field>
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="parent_id" ref="a_liabilities"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -333,7 +333,7 @@
     <field name="parent_id" ref="tc_root"/>
 </record>
 
-<!-- VAT -->
+<!-- TAX -->
 
 <record id="tc_base_vat" model="account.tax.code.template">
     <field name="name">Value Added Tax</field>
@@ -341,13 +341,13 @@
 </record>
 
 <record id="tc_base_output" model="account.tax.code.template">
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="code">PP30_4</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
 
 <record id="tc_base_input" model="account.tax.code.template">
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="code">PP30_6</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
@@ -397,7 +397,7 @@
 
 <!-- TAXES TO BE PAID -->
 
-<!-- VAT -->
+<!-- TAX -->
 
 <record id="tc_tax" model="account.tax.code.template">
     <field name="name">Taxes to be paid</field>
@@ -410,13 +410,13 @@
 </record>
 
 <record id="tc_tax_vat_output" model="account.tax.code.template">
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="code">PP30_5</field>
     <field name="parent_id" ref="tc_tax_vat"/>
 </record>
 
 <record id="tc_tax_vat_input" model="account.tax.code.template">
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="code">PP30_7</field>
     <field name="parent_id" ref="tc_tax_vat"/>
     <field name="sign" eval="-1"/>
@@ -485,7 +485,7 @@
 
 <record id="tax_input_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_input_vat"/>
@@ -497,7 +497,7 @@
 
 <record id="tax_output_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_output_vat"/>
diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index bb15368878e..292872a7b6e 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -27,7 +27,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input VAT -->
+        <!-- Sales + Input TAX -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 539ea69ba63..794aa13e2b9 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -169,7 +169,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -278,7 +278,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 48eaca6c73b..6ec3e728653 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -150,7 +150,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index c07bd06f402..e76e3a00196 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -148,7 +148,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 3a3bfc55042..2a0b4b1955a 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -134,7 +134,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -236,7 +236,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>

From a93a1a0937208bb4a8c3421386a61fa7ed2a89dc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:26:36 +0200
Subject: [PATCH 305/397] [FIX] l10n_be_invoice_bba: correct fix of algorithm
 stuff, previous commit was pure bullshit

bzr revid: qdp-launchpad@openerp.com-20120718122636-3njcyy79d35k3rnt
---
 .../account_invoice_view.xml                  |  2 +-
 addons/l10n_be_invoice_bba/invoice.py         | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index 924cc0fcd48..bf1cf96f537 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="payment_term" position="after">
           <group col="4" colspan="2">
               <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/>
+                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)" colspan="1"/>
               <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
           </group>
         </field>
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 93f9f22b1fa..bb03e4d6d02 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -44,7 +44,7 @@ class account_invoice(osv.osv):
         #l_logger.warning('reference_type =  %s' %res ) 
         return res
 
-    def check_bbacomm(self, val):
+    def check_bbacomm(self, val):
         supported_chars = '0-9+*/ '
         pattern = re.compile('[^' + supported_chars + ']')
         if pattern.findall(val or ''):
@@ -64,7 +64,7 @@ class account_invoice(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
@@ -75,10 +75,7 @@ class account_invoice(osv.osv):
             if (type == 'out_invoice'):
                 reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
                 if reference_type:
-                    algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
-                    if not algorithm:
-                        algorithm = 'random' 
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
         res_update = {       
             'reference_type': reference_type or 'none',
             'reference': reference,
@@ -86,17 +83,15 @@ class account_invoice(osv.osv):
         result['value'].update(res_update)
         return result                    
 
-    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, context=None):
         partner_obj =  self.pool.get('res.partner')
-        reference = reference or ''  
+        reference = reference or ''
+        algorithm = False
+        if partner_id:
+            algorithm = partner_obj.browse(cr, uid, partner_id, context=context).out_inv_comm_algorithm
+        algorithm = algorithm or 'random'
         if (type == 'out_invoice'):
             if reference_type == 'bba':
-                if not algorithm:
-                    if partner_id:
-                        algorithm = partner_obj.browse(cr, uid, partner_id).out_inv_comm_algorithm
-                    if not algorithm:
-                        if not algorithm:   
-                            algorithm = 'random'
                 if algorithm == 'date':
                     if not self.check_bbacomm(reference):
                         doy = time.strftime('%j')

From 11255b9a3b81a2f33764aa9508874670318c46f8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:27:19 +0200
Subject: [PATCH 306/397] [IMP] account_budget: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718122719-x90uevtkjqqgw71w
---
 addons/account_budget/account_budget_view.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 3ab8a23c6ee..db83df9c07f 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -117,9 +117,14 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                     </header>
                     <sheet string="Budget">
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
@@ -153,15 +158,15 @@
                                                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                                 <field name="general_budget_id"/>
                                                 <field name="planned_amount"/>
+                                            </group>
+                                            <group>
                                                 <label for="date_from" string="Duration"/>
                                                 <div>
                                                     <field name="date_from" class="oe_inline"/> - 
                                                     <field name="date_to" class="oe_inline"/>
                                                 </div>
-                                            </group>
-                                            <group>
-                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                                 <field name="paid_date"/>
+                                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                             </group>
                                         </group>
                                     </form>

From cfc2c74e37d4ec56b37c0913bbeed586b8816e61 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 14:27:30 +0200
Subject: [PATCH 307/397] [IMP] account_asset: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718122730-kvmfa63h5zlxj59v
---
 addons/account_asset/account_asset.py       |  2 +-
 addons/account_asset/account_asset_view.xml | 36 ++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 2e9df0b5693..8cd73c60aa7 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -233,7 +233,7 @@ class account_asset_asset(osv.osv):
             "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
             "  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"),
         'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
-        'method_period': fields.integer('Period Length', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
+        'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
         'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}),
         'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 90c4db33ac6..dec5f3714d6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -88,25 +88,25 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name" class="oe_inline"/> -
-                        <field name="code"  class="oe_inline"  placeholder="Reference"/>
+                    <div class="oe_button_box oe_right">
                         <button name="open_entries" string="Entries" type="object" class="oe_inline"/>
-                    </h1>
-                    <label for="category_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="category_id" on_change="onchange_category_id(category_id)"/>
-                    </h2>
+                    </div>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" class="oe_inline"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
+                            <field name="category_id" on_change="onchange_category_id(category_id)"/>
+                            <field name="code"/>
                             <field name="parent_id"/>
-                            <field name="partner_id"/>
                         </group>
                         <group>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                             <field name="purchase_date"/>
                             <field name="currency_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
@@ -116,20 +116,20 @@
 	                                <field name="purchase_value"/>
 	                                <field name="salvage_value"/>
 	                                <field name="value_residual"/>
+                                    <field name="partner_id"/>
 	                            </group>
 	                            <group>
 	                                <field name="method"/>
 	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                    <label for="method_time"/>
+                                    <div>
+	                                    <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
+	                                    <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
+                                    </div>
 	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-	                            </group>
-	                        </group>
-	                        <group>
-	                            <group>
-	                                <field name="method_time" on_change="onchange_method_time(method_time)"/>
 	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
 	                                <field name="method_period"/>
 	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-	                                <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
 	                            </group>
 	                        </group>
                         </page>
@@ -177,7 +177,7 @@
                             <field name="history_ids" readonly="1"/>
                         </page>
                         <page string="Notes">
-                            <field name="note"/>
+                            <field name="note" placeholder="Add an internal note here..."/>
                         </page>
                     </notebook>
                 </sheet>

From 775fc0da2f08e7386dcbce173593dbe379869fb5 Mon Sep 17 00:00:00 2001
From: Kuldeep Joshi <kjo@tinyerp.com>
Date: Wed, 18 Jul 2012 17:59:36 +0530
Subject: [PATCH 308/397] [IMP] give name to page and group

bzr revid: kjo@tinyerp.com-20120718122936-yeew81t4xnc3hsfj
---
 openerp/addons/base/res/res_partner_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index d814ca231f9..fd8830da9ff 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -229,12 +229,12 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="History" invisible="True">
-                            <group string="Tasks" invisible="True"></group> 
-                            <group string="Claim" invisible="True"></group>
-                            <group string="Event" invisible="True"></group>
-                            <group string="Registration" invisible="True"></group>
-                            <group string="Campaign" invisible="True"></group>
+                        <page string="History" name="History" invisible="True">
+                            <group name="Tasks" string="Tasks" invisible="True"></group> 
+                            <group name="Claim" string="Claim" invisible="True"></group>
+                            <group name="Event" string="Event" invisible="True"></group>
+                            <group name="Registration" string="Registration" invisible="True"></group>
+                            <group name="Campaign" string="Campaign" invisible="True"></group>
                         </page>
                         <page string="Internal Notes">
                             <field name="comment" placeholder="Internal notes about this customer..."/>

From 1b1ff0fa6fa9395ecba2265079846fd5ab6ea7b5 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 14:49:27 +0200
Subject: [PATCH 309/397] [FIX] update sequence number of redundant Knowledge
 and Project top menu items

bzr revid: abo@openerp.com-20120718124927-9dxuo58te1d4w9r6
---
 addons/crm_claim/crm_claim_menu.xml       | 20 ++++++++--------
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 13 +++++++----
 addons/knowledge/knowledge_view.xml       |  6 +++--
 addons/wiki/wiki_view.xml                 | 28 +++++++++++++----------
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index d4bfd8f21bb..bba8e6556ee 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
-            groups="base.group_sale_salesman"
+
+        <!-- Top menu item -->
+        <menuitem name="Project"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            groups="base.group_sale_salesman"
+            sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
             parent="base.menu_main_pm" sequence="2" />
 
         <!-- Claims Menu -->
-
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
@@ -51,13 +53,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"/>
-        
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index f5c36eb1ab1..9557d5e1d45 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <menuitem
-            icon="terp-project" id="base.menu_main_pm"
-            name="Project" sequence="10"
+
+        <!-- Top menu item -->
+        <menuitem name="Project"
+            id="base.menu_main_pm"
+            icon="terp-project"
             web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"/>
+            web_icon_hover="images/project-hover.png"
+            sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
 
-<!-- Help Desk (menu) -->
+        <!-- Help Desk (menu) -->
 
         <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
             <field name="name">Helpdesk Requests</field>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 5f36ad110c6..5ed5256b0e6 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -10,9 +11,10 @@
             groups="base.group_system,base.group_document_user"
             sequence="130"/>
 
-        <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration"
+            parent="knowledge.menu_document" sequence="50"/>
 
-        <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+        <menuitem name="Collaborative Content" id="knowledge.menu_document2"
            parent="knowledge.menu_document"/>
 
     </data>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 700585122d3..1041644f3b8 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge" icon="terp-stock"
-           id="knowledge.menu_document" sequence="19" />
 
-       <menuitem name="Configuration"
-           id="knowledge.menu_document_configuration"
-           parent="knowledge.menu_document" sequence="50"/>
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            icon="terp-stock"
+            sequence="130"/>
 
-       <menuitem name="Wiki" id="menu_wiki_configuration"
-           parent="knowledge.menu_document_configuration" sequence="2" />
+        <menuitem name="Configuration"
+            id="knowledge.menu_document_configuration"
+            parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem name="Wiki" id="menu_wiki_configuration"
+            parent="knowledge.menu_document_configuration" sequence="2"/>
 
 
         <!--  Wiki Groups Tree view -->
@@ -38,7 +42,7 @@
                     <group col="2" colspan="1">
                         <field name="method"/>
                         <field name="home" domain="[('group_id','=',active_id)]"
-                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
+                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Notes">
@@ -61,7 +65,7 @@
                          name="open_wiki_page"
                          string="Open Wiki Page"
                           type="object"
-                          icon="gtk-ok" />
+                          icon="gtk-ok"/>
                 </form>
             </field>
         </record>
@@ -131,7 +135,7 @@
                     <sheet>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
-                                <h1><field name="name" select="1" /></h1>
+                                <h1><field name="name" select="1"/></h1>
                             <label for="group_id" class="oe_edit_only"/>
                             <h2>
                             <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
@@ -203,7 +207,7 @@
 
         <menuitem parent="knowledge.menu_document2"
             id="menu_action_wiki_wiki" name="Wiki Pages"
-            action="action_wiki" />
+            action="action_wiki"/>
 
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
@@ -258,7 +262,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <act_window 
+        <act_window
             context="{'search_default_wiki_id': [active_id], 'default_wiki_id': active_id}"
             id="act_wiki_wiki_history"
             name="Page History"

From ebec068b6b52983040240bc55fbf07a82a0e97d5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:08:03 +0200
Subject: [PATCH 310/397] [IMP] in wizards, move buttons in the footer

bzr revid: rco@openerp.com-20120718130803-hl42sgc8i0z7f0nu
---
 openerp/addons/base/res/res_config.xml | 86 +++++++++++++-------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 0541bf46b48..37e50e91492 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -1,54 +1,54 @@
 <openerp>
-  <data>
+<data>
     <record id="res_config_view_base" model="ir.ui.view">
-      <field name="name">res.config.view.base</field>
-      <field name="model">res.config</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form version="7.0">
-             <header>
-               <button name="action_next" type="object" string="Apply" class="oe_highlight"/>
-               or
-               <button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
-             </header>
-             <group string="res_config_contents"/>
-          </form>
-      </field>
+        <field name="name">res.config.view.base</field>
+        <field name="model">res.config</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form version="7.0">
+                <group string="res_config_contents"/>
+                <footer>
+                    <button name="action_next" type="object" string="Apply" class="oe_highlight"/>
+                    or
+                    <button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
+                </footer>
+            </form>
+        </field>
     </record>
 
     <record id="view_config_wizard_form" model="ir.ui.view">
-      <field name="name">Compabitiliby configuration wizard</field>
-      <field name="model">ir.actions.configuration.wizard</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <form string="Next Configuration Step" version="7.0">
-            <header>
-                <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
-                or
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </header>
-            <group>
-                <field name="note"/>
-            </group>
-        </form>
-      </field>
+        <field name="name">Compabitiliby configuration wizard</field>
+        <field name="model">ir.actions.configuration.wizard</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Next Configuration Step" version="7.0">
+                <group>
+                    <field name="note"/>
+                </group>
+                <footer>
+                    <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
     </record>
 
     <record id="res_config_installer" model="ir.ui.view">
-      <field name="name">Inheritable view for installer objects</field>
-      <field name="model">res.config.installer</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <form version="7.0">
-            <header>
-                <button name="action_next" type="object" string="Install Modules"  class="oe_highlight"/>
-                or
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </header>
-            <separator string="title" colspan="4"/>
-        </form>
-      </field>
+        <field name="name">Inheritable view for installer objects</field>
+        <field name="model">res.config.installer</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form version="7.0">
+                <separator string="title" colspan="4"/>
+                <footer>
+                    <button name="action_next" type="object" string="Install Modules"  class="oe_highlight"/>
+                    or
+                    <button string="Skip" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
     </record>
 
-  </data>
+</data>
 </openerp>

From 8c403c671c20a0b45adb367b5510f8a6f91ad8a2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:08:22 +0200
Subject: [PATCH 311/397] [FIX] in all wizards, move buttons to footer

bzr revid: rco@openerp.com-20120718130822-wn71hhjukhqblijc
---
 addons/plugin_outlook/plugin_outlook.xml         | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 0340a7c502f..811661bf127 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,7 +14,7 @@
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index fef7772dfdf..69e83bf6df2 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -14,7 +14,7 @@
                      <separator string="title" position="before">
                         <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>

From 391a35389c42b81a5306f8954cace8a235a763bd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 15:14:03 +0200
Subject: [PATCH 312/397] [IMP] remove deprecated attributes 'icon', 'web_icon'
 and 'web_icon_hover' from top menu items

bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
---
 addons/account/account_menuitem.xml         |  3 ---
 addons/association/profile_association.xml  |  3 ---
 addons/base_tools/tools_view.xml            |  3 ---
 addons/crm_claim/crm_claim_menu.xml         |  3 ---
 addons/crm_helpdesk/crm_helpdesk_menu.xml   |  3 ---
 addons/hr/hr_view.xml                       |  3 ---
 addons/knowledge/knowledge_view.xml         |  3 ---
 addons/mail/mail_thread_view.xml            |  2 --
 addons/marketing/marketing_view.xml         |  3 ---
 addons/mrp/mrp_view.xml                     |  3 ---
 addons/point_of_sale/point_of_sale_view.xml | 10 ++--------
 addons/project/project_view.xml             |  3 ---
 addons/purchase/purchase_view.xml           |  3 ---
 addons/sale/sale_view.xml                   |  1 -
 addons/stock/stock_view.xml                 |  3 ---
 addons/wiki/wiki_view.xml                   |  1 -
 16 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 69c4f3a7307..9ac6f98661c 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Invoicing"
             id="menu_finance"
-            icon="terp-account"
-            web_icon="images/accounting.png"
-            web_icon_hover="images/accounting-hover.png"
             groups="group_account_user,group_account_manager,group_account_invoice"
             sequence="100"/>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 3936824972b..099a6f1ac97 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Association"
             id="base.menu_association"
-            icon="terp-calendar"
-            web_icon="images/association.png"
-            web_icon_hover="images/association-hover.png"
             sequence="70"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
index 3002931cf17..fbe0e16e31a 100644
--- a/addons/base_tools/tools_view.xml
+++ b/addons/base_tools/tools_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Tools"
             id="base.menu_tools"
-            icon="STOCK_PREFERENCES"
-            web_icon="images/tools.png"
-            web_icon_hover="images/tools-hover.png"
             sequence="160"/>
 
     </data>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bba8e6556ee..46f8760387a 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="base.group_sale_salesman"
             sequence="90"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 9557d5e1d45..393428e091e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             sequence="90"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 521ebafdd97..0706da45c86 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Human Resources"
             id="menu_hr_root"
-            icon="terp-hr"
-            web_icon="images/hr.png"
-            web_icon_hover="images/hr-hover.png"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"
             sequence="110"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 5ed5256b0e6..9acba0f4b43 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
-            icon="terp-stock"
-            web_icon="images/knowledge.png"
-            web_icon_hover="images/knowledge-hover.png"
             groups="base.group_system,base.group_document_user"
             sequence="130"/>
 
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 06cb8189915..f07e1e467ee 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -5,8 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Feeds"
           id="mail_feeds_main"
-          web_icon="static/src/img/feeds.png"
-          web_icon_hover="static/src/img/feeds-hover.png"
           groups="base.group_user"
           sequence="10"/>
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index d478b9f6479..b4c8a295241 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Marketing"
             id="base.marketing_menu"
-            icon="terp-crm"
-            web_icon="images/marketing.png"
-            web_icon_hover="images/marketing-hover.png"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             sequence="120"/>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 72cd8b5c1ff..943fb0556ec 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Manufacturing"
             id="base.menu_mrp_root"
-            icon="terp-mrp"
-            web_icon="images/manufacturing.png"
-            web_icon_hover="images/manufacturing-hover.png"
             groups="group_mrp_user,group_mrp_manager"
             sequence="60"/>
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 27fc6bb8637..6b1b9132344 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="PoS Backend"
             id="menu_point_root"
-            icon="terp-partner"
-            web_icon="images/pos.png"
-            web_icon_hover="images/pos-hover.png"
             groups="group_pos_manager"
             sequence="140"/>
 
@@ -760,14 +757,11 @@
         -->
         <record id="menu_point_root_touchscreen" model="ir.ui.menu">
             <field name="name">Point of Sale</field>
-            <field name="sequence">150</field>
             <field name="action" ref="action_pos_pos"/>
+            <field name="groups_id" eval="[(6, 0, [ref('point_of_sale.group_pos_manager'), ref('point_of_sale.group_pos_user')])]"/>
+            <field name="sequence">150</field>
         </record>
 
-        <!-- use menuitem to add web_icon and web_icon_hover above -->
-        <menuitem id="menu_point_root_touchscreen"
-            web_icon="images/pos.png" web_icon_hover="images/pos-hover.png" groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"/>
-
         <record model="ir.ui.view" id="view_pos_config_form">
             <field name="name">pos.config.form.view</field>
             <field name="model">pos.config</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9edd731acf2..94836221265 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            icon="terp-project"
-            web_icon="images/project.png"
-            web_icon_hover="images/project-hover.png"
             groups="group_project_manager,group_project_user"
             sequence="90"/>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 45728729719..ebc7df729b5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Purchases"
             id="base.menu_purchase_root"
-            icon="terp-purchase"
-            web_icon="images/purchases.png"
-            web_icon_hover="images/purchases-hover.png"
             groups="group_purchase_manager,group_purchase_user"
             sequence="40"/>
         <menuitem id="menu_procurement_management" name="Purchase"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 62145ad064b..0d000f8ec30 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -5,7 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Sales"
             id="base.menu_base_partner"
-            icon="terp-partner"
             groups="base.group_sale_salesman,base.group_sale_manager"
             sequence="30"/>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 77f4bc33147..b2d45196703 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -5,9 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Warehouse"
             id="menu_stock_root"
-            icon="terp-stock"
-            web_icon="images/warehouse.png"
-            web_icon_hover="images/warehouse-hover.png"
             groups="group_stock_manager,group_stock_user"
             sequence="50"/>
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1041644f3b8..c88255a073a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -5,7 +5,6 @@
         <!-- Top menu item -->
         <menuitem name="Knowledge"
             id="knowledge.menu_document"
-            icon="terp-stock"
             sequence="130"/>
 
         <menuitem name="Configuration"

From 6001d4fcb4e8b7eebe83789f44219a76b489355f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Jul 2012 15:27:35 +0200
Subject: [PATCH 313/397] [FIX] temporarily desactivate commits 2748 & 2747
 because there are problems with werkzeug versions

bzr revid: nicolas.vanhoren@openerp.com-20120718132735-t2lg790pl9g4ccgj
---
 addons/web/common/http.py | 71 +--------------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index cd17f5711e0..cc76a554693 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -452,7 +452,7 @@ class Root(object):
 
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
-            self.dispatch = SuperSharedDataMiddleware(
+            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
                 self.dispatch, static_dirs, cache=False)
 
         if options.session_storage:
@@ -555,75 +555,6 @@ class Root(object):
                         return m
                 ps, _slash, meth = ps.rpartition('/')
         return None
-    
-class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware):
-    """Redefine SharedDataMiddleware to better handle the cache = False directive.
-    Also desactivate 304 Not Modified headers only when the referer has 'debug' in its
-    arguments.
-    """
-    def __call__(self, environ, start_response):
-        import os
-        import mimetypes
-        import werkzeug.http
-        import urlparse
-        # sanitize the path for non unix systems
-        cleaned_path = environ.get('PATH_INFO', '').strip('/')
-        for sep in os.sep, os.altsep:
-            if sep and sep != '/':
-                cleaned_path = cleaned_path.replace(sep, '/')
-        path = '/'.join([''] + [x for x in cleaned_path.split('/')
-                                if x and x != '..'])
-        file_loader = None
-        for search_path, loader in self.exports.iteritems():
-            if search_path == path:
-                real_filename, file_loader = loader(None)
-                if file_loader is not None:
-                    break
-            if not search_path.endswith('/'):
-                search_path += '/'
-            if path.startswith(search_path):
-                real_filename, file_loader = loader(path[len(search_path):])
-                if file_loader is not None:
-                    break
-        if file_loader is None or not self.is_allowed(real_filename):
-            return self.app(environ, start_response)
-
-        guessed_type = mimetypes.guess_type(real_filename)
-        mime_type = guessed_type[0] or self.fallback_mimetype
-        f, mtime, file_size = file_loader()
-        
-        etag = self.generate_etag(mtime, file_size, real_filename)
-        modified = werkzeug.http.is_resource_modified(environ, etag, last_modified=mtime)
-        
-        headers = [('Date', werkzeug.http.http_date())]
-        if self.cache:
-            timeout = self.cache_timeout
-            headers += [
-                ('Etag', '"%s"' % etag),
-                ('Cache-Control', 'max-age=%d, public' % timeout)
-            ]
-            if modified:
-                headers.append(('Expires', werkzeug.http.http_date(time() + timeout)))
-        else:
-            headers.append(('Cache-Control', 'no-cache'))
-            
-        referer = environ.get('HTTP_REFERER', '')
-        parsed = urlparse.urlparse(referer)
-        debug = not urlparse.parse_qs(parsed.query).has_key('debug')
-        # it's important to put it at the end
-        if not debug and not modified:
-            f.close()
-            start_response('304 Not Modified', headers)
-            return []
-
-        headers.extend((
-            ('Content-Type', mime_type),
-            ('Content-Length', str(file_size)),
-            ('Last-Modified', werkzeug.http.http_date(mtime))
-        ))
-        start_response('200 OK', headers)
-        return werkzeug.wsgi.wrap_file(environ, f)
-
 
 class LibException(Exception):
     """ Base of all client lib exceptions """

From 56e6186ad91b2ef9bf6371a5877133a3b7e9a4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Jul 2012 15:32:34 +0200
Subject: [PATCH 314/397] [IMP] mail, email_template: chatter: added forgotton
 images for links/buttons, cleaned a bit the CSS for the composer.

bzr revid: tde@openerp.com-20120718133234-p933jg1y8658i5ah
---
 .../static/src/img/email_template.png         | Bin 0 -> 2898 bytes
 .../static/src/img/email_template_save.png    | Bin 0 -> 3100 bytes
 .../wizard/email_compose_message_view.xml     |  21 +++++-------------
 addons/mail/static/src/css/mail.css           |   4 ++++
 .../static/src/css/mail_compose_message.css   |   2 +-
 addons/mail/static/src/img/attachment.png     | Bin 0 -> 1142 bytes
 addons/mail/static/src/img/checklist.png      | Bin 0 -> 976 bytes
 addons/mail/static/src/img/formatting.png     | Bin 0 -> 3466 bytes
 .../mail/wizard/mail_compose_message_view.xml |   7 +++++-
 9 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 addons/email_template/static/src/img/email_template.png
 create mode 100644 addons/email_template/static/src/img/email_template_save.png
 create mode 100644 addons/mail/static/src/img/attachment.png
 create mode 100644 addons/mail/static/src/img/checklist.png
 create mode 100644 addons/mail/static/src/img/formatting.png

diff --git a/addons/email_template/static/src/img/email_template.png b/addons/email_template/static/src/img/email_template.png
new file mode 100644
index 0000000000000000000000000000000000000000..d679492bc19f71ea893d6c9d3ebd48f3b5e425f4
GIT binary patch
literal 2898
zcmV-Y3$65tP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk|
z4GIH_CLfak01DDcL_t(o!_AmUk7QR?$A5QtQ;ZoIIlHnZXLTF5t)_tuGN?fo>@4*s
zV8M<J`&NGdJ_5}KH4-e45GxQ;3qiL95?B_p3n;hC<*X{(mF3DgBIC{X-oqj?qbgll
zV%Z&1C|<nr_x|^sbMOBkBK)d-d<ZCj5W;Px)b|1Z%LEcIBJy*i^{xd_N`1d+n!hZH
zg1x;xoO8TNNl^-v<>IK8fI{ZCJ-@v|&=M{lMi7N4{YoIMHQU#()9rS#*8VXt2LpUj
z6vS~%r_&)#Q<PG#1k*YO&gF)0Y|A<5`L+aHPzaarrwEJf>2!+K&^8s3?RkI;FrGYl
zvN);V?-R%IE8rACDU`gp=Vis79|J+3gUMpAA`pVdd(YwFA$gwD@AtX=`W-HT6-7a>
z*Q49*5=9Y3QM`IMQRnY3|8LZ&=YxAm$@z~k==aF73<-g@suou+z>G0eRYh5rOePbw
z)+nVGs=cV5Qi>1)B7%rqIxmE<_#b>gX@zKe33VQSg7=O*&*#^s3ipB#m%y5)p{{G<
zIHs;^LI^Jpq*5fY0nwoK0tUeQ`Op|+Fvie&k5ZOEi$^cCyNEbNAdM5Ms>T?Pr21vB
zx~@4oI$|=JkR%COU(TWnWkdqg;802<B7_idKHz;I%QCzV7#pFK!Z{Dx5KK%^21PiJ
z&44}!(<*0{&lvW)L`nKGnD?F}NmyQ9z67O|x-_hcfDu8|c@P_e(gv*!bzS3pKx;#g
z`O7*1uOnLQTq%)x7K=a#Xah;w!Ndvvh0I-mrD@9M<|d=jXc0pfP?x?cV6`TAPY@v}
zjY6Ze#u$Th9zoFtA<uJK=c$QsDh31z9wh-pkkBHorEOb$TSIU!gDIs*l9+C{O9+9c
zX)XozMJ$EjaNc38MQejrYM%D(JieTt$4}$u_o!NrGnSwOL4>(rb1)5LSr=;?DkapV
zUrap<u(qvnu4XzrrD#0+M<+BAW2`0w2tlC%EiH-m^s|J>YL@#Qq9j6VArPUB!YhsU
zf<y+_G&D_xQ=YnRh^)nXM`R2lfu@<^n;Ol01~K0RtIC4@Afpw>QJ%AM^E!X~kN=4m
zp$!pQC-mZ&>g<S4)bQRP{2qIcK4pEpgqDW3sqrd8;tY(%8O5xwc=+W*PEQJq&Di^T
zpH8PsSyf!Wex1lD%6vvAiC7(vh+oJz`(pj}PSJXyoH<4!eDc2!@OntoMwFGKpL8&>
zuz&OwzyF7xPrq(><E;V4Rdo6z0&qO5sEe8?Nl0wQcfS1{j!$Q#S)Xrx+aW++l&q|*
z&^8st*_2Ka6B#IGlb69n3`$~X1JW8!_5(ZHcQ~scPWz0PMjSkQN`Ew9b+tnfjd(|J
zP|r$clNmuN2FoLK6A)!-D$nlc59kkv>^(g|+n6NH$cuurvoo5yWarjRa4kiVQ&;t3
zZn&hF#$t`eO3J8bdG_TVVp2}qeGVT5e(>J!(v)YMb_}QYKW8gC<KVLoQCcyZ<*aYr
z;`nJzXK9@z1_=q)cIkA7Jo$Pb6D7>@oLOEl7!2rSDOFXG7)@j?5=V=IVPDKRB%sA$
zP-IccPk#L8B)vXKY-!3<e)y;F@ee=wYwj#HM8}R{q}luIh$0vcPHX<?M}Nk>|GH0-
zEm6{;Y&@gYZOUrO%E}78;pkig&HnyAX`0M48KExAtLMrfE#9{f0!kWA_Y3-&rEMl0
z9Uf8Uhir^Gluth5S{xXs3hND>ddjC?9PrsMzJilKLA6u5iDKeCHc8q0;t7wxxX;$c
zhzGlmFxK+jU;iHW?%hKx;m++_+`7I^uh%8Ns*bg7flwk?6gg1xFF*ZzI{hvZO8(>D
zeu|PAu`XC!9x}YKfgUcgbTnnSe#8k8(&lI@oRw2_XPLU0viaJWjji7zv5FhFc0kQn
zZ|}bQE)pC~S>T<c^$l&?T&0-9`-(`#jK@9x``*Xw?H^#YMp5zT!T<2vzj2$t`MZDO
z!+#cj=Qr=LvvV7<5oe{adsLwYV-BZJN!psO6||Im_4pyv$pn;Ub$yespFLw^bBo>G
zU7ETijV!-*XNTdSOYZzD%0+NkqsY>Tx8L63E&T?aUZ1v@^6#-{G#pVTV~VZU`7pP9
z^zjM#*#u0))8iRuZ9-`~WWyz#uTi05YqdwOli-44ZGD{}u)MrX(=>S35F7o%GAdlL
z?7?6}(Ygk$14*25Je}gjGae2YEw6EMRFL%6cz6nB)FX=&C$olGKI74oBSNx-(_Lm&
zOKc5VEAk>I&l^NV+`oUHD2};%_b%Jp+vqeVv<*dB6508re}!TZN?CkU;Z1|l@qCG$
z_L)v9BqS^iH~EVn{}sLQ3R*mt23O`}{Vqf)zqq%{aA^f&GMsbdvxc&6De{7<6%LM0
zSY2D^@#Dvg$79N3#_7=^*ETokc2_w*cy>jM1%*h2)*jK&xE2?Lsy@SFxqb6neDv`r
zoK244^G~qKlUhwvS70r(7RJ|avvO^XDzAu>gsi`WGM3?Zi&<WA<JRjWY0AdtCQC~r
zX44aH-`FO!EoquuvMbNC(mPtwh>q~iW1<MH6s~P)adi6`x88UiYj&_&AUK+)q?05B
zfhGhRG@><?t8jHoaW>__XAc;!Z*c$Nm-M<_g3OmgX%e$CUMAaI$G0^nhx=IMswv6i
z35aOC2(EU-aZJD8JzoXX_~3Ec(o}&giBVaPuTQ6JY_3sHCTI;!odb&4bXXk^$db2^
zI3w+kFvj4$M;lE!E9hhiB0{f|qC$%?>MF43w8j|j-o1;6Fc=JInua{jFWf0UXtp-i
z$nz;Tw{P&XpZzOY)?qLh5XUL~(K6mSp6%~*aB#|TUNKr(!=10uR##Ve@^lY^V`VgC
zWi+4@>2tGp1=xl22_Y~T3>J=DL`af^BuPMPrf0?6Cp67`@~s;>oi0^fBWMOnVWS9Z
z4gG$fGAO+FSR0)`1L8PFs|aHwQ1emp!mGi&_c-U+-rm0CfJ6l69LgAOr#-SHX6a-=
zH%WQ(%{R%ij5v;&OwR}*P}enW>*#hn+#IbinHBW9ed@MBYt827CTWsDXi1DF_zLI4
zRpsJ2oKlJpKKOvs(^It8SZfgx>bk~@aBce*ab!3-Ib?HnjfanRQA)A1v%}deXLVzX
z;c)ysJc2`OL1_ryp)e?=@WInoHJ*T00j2d-<svNB_ifv9=gysZpq`r$W6az=X^nGW
zjN<0aZ6-&@yz|aG?C<Y$?b<btPfp3Y-NiLZDeAhxYJ>Qe;2m)k;he)Y9%D2r2yq-!
zUR5qGjP8Xq9t;LAwFm@3P#A0GPDgoGR#p%Ko12?>?^#+}!il0ROQOh9Rn2)zK~a}2
zkyg06z$iU8z2a%=iZt$07Wvh_QbcImmMqJts_N>dik@4wx!n;$0MzqVLGT_g3hx8X
zIlK=j#oWkfjfA-eM+A|8*3j)FSQY4IR~X)2uScHe^m;w|{XTVFzXW#C)A2zs6w?7v
z&szlWJne(gSR)t}P)g3dx0?6Z(DMup9)jcK_>i`$aIU=sW?p;kHQs;!eGU!|7Ukia
zZGwybn8@7jqXIezmwHlYf;NPpX_X*eVU@>7ShTPfoeKp<fp1$@$0NS?-M6teG8gTu
wUx`*{+qOt>CQjm?D`j`D?CAWmKf$;BA7N+_=ntk4xc~qF07*qoM6N<$f;;PNWdHyG

literal 0
HcmV?d00001

diff --git a/addons/email_template/static/src/img/email_template_save.png b/addons/email_template/static/src/img/email_template_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf29f9ab4ad59ca18e67d5a841322ccf95322647
GIT binary patch
literal 3100
zcmV+%4CC{OP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk|
z4G16_cMM|y01KQ+L_t(o!;P5RuO-(}#(!07^<`hrnKR?@Wnu?K*d`X2L?R#rL_qQo
zAw`PB6AwXo;{V|<0A2~P1P|fG3IYNWM92!VgoB;&1>4x3bIzR0zI3lkRUUeunIU;`
zOKY!I@4Z`JSJn5`S1q2dNfM5J8fU%$W<WfwYo=obj6emJhif~)59jVr>;fwM!r?$Z
z?8gqX3Oj)qpargg0^DJb)-BOItcvJG1<n%;r-_<JJXEela938+kbq>BIgW~u>H(Nf
zfE;jl1VQyN=o`ci6j#iJqf+Q{WsHFsp_PKqdya0+IPL<i3-MBBJ_@|OcmDn#&Uo`b
zK4dqXvJ1uqEu}2!<QVG%o3ur9Vb(@!-2jG}<L;Ol?uH<U3hp<E{csL$3!<%93=fh0
z6+XL#l^t#Vl;?iwE`Rt3ukh{PzQv124Y6(DBEjE&|CE3J*Z29A7oOv&f0oj=Jk<tD
zR?;pY3uW&{**U9Dz(zzIGccQ?W$xgD*-fBs08QYMHI&@2D0gUTCACX-yMd6;xc~4Y
z-ud1SxEEjH&hLDVxXJM8Y2uAHKIXaSpXKFWeU^upS4cbO;|u53NyAPv))s0o_ElNL
zhMcZ}f(w{T(Q=u<R1BEX=Qu770y#jP2`e#%U1lV5@A*40EO__b#Ki}n@WxyB`Pvtc
zh_L~0E8DbX7S}k5uYYyLdI_(7_kF(p%IBF?$4E$Y(nDDEJ*Ib%o2Wdon@{Qeh58p~
zWFW_p=+3{t{!`u^TE6kkJ6xRyzV~-)#<Re<-!bk-;ttqU*m}>cZo!=w8t$zp7WVa=
zFMsayJli!uq0x%(TV}1ZD}swmG(3Dx*aA<Yl1Cp<>Cgx@!AGzEg!7zvX$|jP2>Z*#
z=HZt3g&AIqSb(g7%d+MqbiDPUadx`rBuqD(_n;{u^#aw(T$bc*q|rHs@>vf7Vu1iG
zSAw4jt)1{U--YcMS+-Bn>JhDg=R)j(-j&9B${4u1HuA&Fb=lMS0xF0{#EuaMlLKNA
zkk5<@chE*KhiwL*9dml7Jh)$R5w=A!B5oDMiF1efXv}M6CeTVl^do|Gcpazoc)*!c
z9jZVPu%Fke&k(X4AOX@sKI++z9T$68_DX028N&|R7?%bMcVfMOw8X{^ONtex^+XhC
z6ueIVa1qc<l!yzT9i2E?4UdYWT=9S_Z>U{hFOf0tF-aJXOC{z2S&bwkgI30%XoOx`
zN-9(Z_k>6U6bTNpLu7%t9+2H2RKOlr`xD=}3s4a^g0z$|QN~0&Yf*D*Drj}o!A*$g
zz<Cs|`<8B|Y<j^3v_edUq(+q;u`a<B2^(Mw%nv{g{Yd1n>!aNHla=q#lnyNrdsyca
zR_TOlk-h_$C80KGHN=&ufFQVaxCLr;#sncdOEV%$M?i5zjK)VIjvUk+F$4qiM|pJ-
zj6fBoieP|+sgFM5OK8c~vQ1DG28Sd<3694?oB@3mGzBy(tyQ82)CDVwIyAO;l$}5%
zpqSj~mmyvcDYQeRgeu^oQz-~k5s(9LgguE-3=0z}b^-(=N5{1i0}$N_R!}qapy1UZ
zOV3W=S{08IBYRn+3hIKmpdJz8WOv-B#x4RVRi+FhPDG}Mzz8&SHq!c@V8^IIFatNl
z4ReTg(3nu`VP#?ov{eX}2|q`9LoflIkf8op`Nbzd$RTbH;!f)mIKdEc6lgpX>PVyz
zYCviNE4WSfh~;1a#UXg6sW8vVJnf0;f^~+KK$wC-P@}q&LYyKakJ&c?nJxtfbwjAA
zPfZ<#tj(m&?gX!>WkPY(3fNTm?oR*<ZWAM_6KkT$dzzBa1LMOJb~SjVbHUJqgLuq9
zIaFB?LD7j64!B|3Fiuy=+L4J=pB~7}r~0XmxDY2V=cpHOCN{ZJXeioa?bOi2VL1^e
zq6e|KiPxj`WY<O@#Q)bX>*06%?u30<Fw)}UI0_yRmnk^$Q2bgF#hk6rFm2d3GX{B?
zZ~w)Ab2Oh*E>Bs{T2c^pn+uk8q>a-<WCA7)*#jvXh%#l*P%DW0q2@+3RK`^K--|hy
z>#wkHl({>}0=N>ip^cG<-{d<}UD#`fiz7kt^$DL`t=X<3D)-n(WmJXM+2;&a$rX|Z
zDuFS>*g)HKRP#yN?D4SDmMhwFics+5HD%tD5(E>>BOGK(9pX(2)GGoMXUe<5)kdhX
z;bQAN<-&ORe_Yi{JHO4<Ua3Wp5Qt4Xc~*6z!fvP(pd4)X#C)NV1wBUB7_=v35k_@7
z6ErB8ASRRYPeSO37t9SmL@=7LT2xvWt{-lA@o6~f3fnqTnk(}08ml0dsQHRCj!-fo
z1a#4mO(+JLKy{&_?4{+C>xS)+PzpPmN!==hYETXLFu4n3B93}Syi6llg;<T@;vu52
z%maV?YsdWF3%`ssaGpVDlXzMJ2IvGrg)%@I48te}$&`#zfdARUU;l9AqmK)CC3s8Q
zI<l>h6L>|e#Y_&xj}dL8c%k6r1L?cfitFNRcZJ$OGlTsI-+%4D_|Fdp`o$3)g%_W>
z&F_BcX`VX*&%$gWxGCA3;6ijLI7@`44zRnX=?g&u^R@v70tIYxA0WgVQ8WZ~B@{(%
zqV>hllH5^U&}pOzFm&+x{eidj3ycp1-F%33fiJa?W^jHEeFQfno0ANZ3&oXe&|4u|
zMKoeb$z>YRgBfCF>azs2DvUw6&>7=Kxa*E?Ah?r6Xhm6WcFgyQKEq64SMPDgF`NE~
z)UUbB1GAO$>8a3mM)iRrnT(O$DJVr9$-pk-GUp;6liSF360Bd66NJ3SiBz2t=Rn^H
zB?PP{7%FWO84rxnS_zyX+{Fa4Ky`x}(PYHb(I%lC1xe5tcoC{8=7CZJ@#fV*1~f4$
z453mrfC!^IK{6^MCPq=6<f4{JEjw1XW+W{Presl)I?6SJp0aC>*~ZF_K;;wW`+G!H
zW?N;xY3O$#8|Xzb>oJ?mrrOkL3J}amx}$_j(QDA-X%^K&l?_>UWF0A?5)&{EPTFMB
zu2QXmC~OntMhG@zur*tYY+cz4jHYBAa8)#1v(uKX9^>)mjgC=qGRmkzwaF~*s*t@S
zd!-&^0r$yOc*eb8QZa?t0!Oo!=WieRdvCufN9#4W@0@UU?r0U<dTPB*sx70*luGNU
zaW^@fxFIzyyGgi76l%>Bh2%<cD5AK-&RR;H<0T-vcr+fw3Sm<A!)zdE2mZ`SpZ@e)
zugKHKXMFs@zj5}-DXUKC4f+DHHc$ighC!ueUJ|o9(APw)^&p6XSj6do4)q4{2K9&%
z2?caq5{DJt5NJo}2I!N}W@z#x?7=}hJKwGP@@IeYN6+xJ-+Ynb!MnWo#*bKgW;u+^
zhs11DY$K!%q$`MJ2022Cc$rblimQ!rwKpyXW0PT%;JQr1?JgU;Y^1T$jEVV}nGc!O
zzOWh-i~Tv>_KdC!v{upTL<zV3!u+4^&G_-3f9os1!GOQ^gZJglfB7M@>L{DcItO0;
zE8)lYR-9iupPp{GpIWjPx^m6shadC7{f}67LK+9EJB4ZLb~D@ycp>eT^V5;*1cNEG
zJ<f=4KgG}A;-#mAyQ`K?_3_YhR_r@D$X~woAoJQkzQd1R{|TFP$)Z^hb_T--^vyNq
zJ(qcgub;=v(D9PaM&??uoEh>+XgVq~4X;eXDW35Vsi9}60h1QmIjTa;I~MHu;=L1o
z|I07)TfhDia+#c?R@i30y${2ynfld>O~>i!C1)4!&})Yciu(iFeuUUkQb!$U^xDvo
zC;x644jqHoQbjQV@j{S_k{Q+5pjc?BOiPF~F2qt;H<9P>KE*R9w}?mW6tsEdEK$Az
z-Y)0S<#>VDmWDtL0Sz<yMT3V(9vaFvG7k-%C=E)mh#bZ`4-HiUCXP^u2VjE~8gneR
q7%jyb@JK{ytzj7(W_?2l%Fh6Ut2bErbk!;V0000<MNUMnLSTZbySY37

literal 0
HcmV?d00001

diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index ce34ea1d551..a911034cb1a 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -41,21 +41,12 @@
                             on_change="on_change_template(use_template, template_id, False, False, context)"/>
                     </xpath>
                     <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
-<!--                         
-                        <a href="#" class="oe_mail_compose_message_template">
-                            <img src='/mail/static/src/img/template.png/' alt='Use template'
-                                title='Use a message template'/>
-                        </a>
-                        <a href="#" class="oe_mail_compose_message_template_save">
-                            <img src='/mail/static/src/img/template.png/' alt='Save as template'
-                                title='Use a message template'/>
-                        </a> -->
-                        <button icon="gtk-paste" type="object" name="template_toggle"
-                                class="oe_mail_compose_message_template_toggle"
-                                string="" help="Use a message template" />
-                        <button icon="gtk-save" type="object" name="save_as_template"
-                                class="oe_mail_compose_message_template_save"
-                                string="" help="Save as a new template"/>
+                        <button icon="../../../../../email_template/static/src/img/email_template"
+                            type="object" name="template_toggle" string=""
+                            help="Use a message template"/>
+                        <button icon="../../../../../email_template/static/src/img/email_template_save"
+                            type="object" name="save_as_template" string=""
+                            help="Save as a new template"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6080c45c75c..5593832549a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -325,6 +325,10 @@
     width: 472px;
 }
 
+/* buttons */
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
+    padding: 1px;
+}
 
 /* ------------------------------------------------------------ */
 /* Messages layout
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
index 58f900389d5..4cd1339ded4 100644
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ b/addons/mail/static/src/css/mail_compose_message.css
@@ -13,4 +13,4 @@
 .openerp .oe_mail_compose_message_icons img {
     width: 20px;
     height: 20px;
-}
\ No newline at end of file
+}
diff --git a/addons/mail/static/src/img/attachment.png b/addons/mail/static/src/img/attachment.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cc0c33257db0fb896907673f314c5365ee6214e
GIT binary patch
literal 1142
zcmV-+1d02JP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk+
z4Fo7>Vhfc300Z_(L_t(o!|j;QYaLY-$3N%ZnKyYazqR?H!9{DWNU0bU-AHg@u>nDe
zysX@pF5D=%5?cQU{{%ru)>aUqK?)iz5|oNcEiPJr6)kCEUf!FTdtA(!=Ec=}ubDOr
zFANNv`{R4R_nhy!_lT-;7@OmewnGan8g!tD2!N`p{d-l-M5G1?kf~}u@ce`Lm;n)>
z99#z;0v-WUU>Eou*eu6rp9@6;g7QEP3;|C7^T06!v<*xE0r(2|QdPG^#P`Es-@t6=
znTQMnCxGXGS>PMsdt>i7@C@)Qa0}P~5@4rtAG4!7X8-HJ=c>9ZB9p*1AOl_no(DEm
zb*FOY7m>(zAAoUH{j`hG+t%kg@Yj8l3lZ`5n*d|xZ%EN1i%NjlJ~6wil(Eu*O)X+O
zvToli0pviZ%N{CYOhlX=V>!0g#aL{%l2NgZC*8VN6=P~l0JMQS<-(<{ORw5M>pzTE
z1I$!D5|MFWxGMlCK^be4rg0q;-0D)2Etmt-CIQZbbi$6Q0sI3THG2+>8>>_)u%Te2
z;URm>m}o(sspcxBcsAlOI{D)We~^ciK&v}w4jx$PBgs@u`gdB4)rTRkTMsV)jU!6f
zOz<*HCmVxMw@7e+>Rx`WLixS<x`MkKZ3+nW$k7r92+j!(xi13Si#y`*1Y9YuhXI(P
zDg+#kXy4W7{Rhohnij&U5`pe9cC|nD4jxz(2_hbX+sD|gHF@wp7J>uk!R>+B`l%XV
zy@vVSc|(vQDcBODziB^n^bAa7*^;vgXdPtSj;bxEUYh}6VPTpOA|OUJK^d|e2wXZ}
zjlim|6ccNjKxiY;CioQ17WnznyNphKjqA*k=hMJ0&fO%0q)g)bo-PNPD?t<#&1>Ld
zh;9(gUM0I3(CieQ*6T#N4YY}(AIWu-kk_HOSgO+Bb4*ox`e?3rRfS~k1a9O#{Ky-s
z3X2yLUOYF+d~=E`S7KCSRE4QW=Sk`xkPN?5WU~vd*R@o&kCb%%GY8EaKeA1_S%+*4
zfQySMEN<=VySh3=qz+-5JU82Utwt`6y&Pm2kH)^ZgZW?}gbTk!um)>uh1xfpIUp!f
zN=Cm&**mb6X5fprYxuD?_+L>!B8?~KwAsu#xf6KvyGD6EVrglVot>jVf|riSs;{&}
zPzHd+6Q>ECSCHrjj-367r%vW9%_wgzW}IFgVdL^~wl~iZLW2;0qUoK>l>sa36{;FU
z&c^WJ(~uT7*~ndE&VS48e3;#Ao}e!PEyRCJny%{r1(LptD)z3_0-($QXMmUN#gqVl
z+RJ<$xB;{VsruYYwWoZXIG|?bftqP!`(8>=0|WcN)Oi@&zbg^#VJBKZ%m4rY07*qo
IM6N<$g4vP$>i_@%

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/img/checklist.png b/addons/mail/static/src/img/checklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..d252606ff539f270faacf93a58e5bd3daf044177
GIT binary patch
literal 976
zcmV;>126oEP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk+
z4Fx)lz)PF}00U4-L_t(o!|j;Aj}1{2$3NeB&zpVTuHCgu2q8*Drx2kKjas9j5mfvS
zdOA@MiBcj_XjBpk<#vJug=CBMbFE$W=i7G_dq$4gc|Rn)*}_du?wQG*JKs6yd%pMH
zk(m*jq>7oXhHC*bvle}9Nx?nKUCZ$$8x2?~;FM40x&dpcTtnP#a6f^S)v6t$Bo9(4
z$lFFtQpMetgG_+L%$7@wSR{O~Do_EI%c@EwRn4pkRJ^YOSAjW6`z19b)e4>)>Y5@c
zjRhsCDyc3h{aqW(3Jur;+yRaQ7l0Mu3osVORDn_VhrF+JvM?qEYGJO7DwtU@$0Usb
zyMYN{)_JxFTsE_Zl172^z%gJ4@EO<!Oaq&G$WjIP2D|{So7r?0O*306j2N&v`1gQ$
z7u~zz{s{2K?`O7{yKZN*!Jh(709*1n){)=L<|U1o*$i+FxB=9FEB;l3W;P?~5ika9
z2kO9*_X}Mj)^J*U0A2%6&CGmN88oxmb`cx!ewX)KfSvBAKqK&Evrk6oyK*e>b4T!#
z-*9vwe<dTQN9;Us3m6BgVZzKGERdKY8z^{JEt{t!upqpr{Golor1RoHtfnlI@wrYG
zG_h6yF6{<v6L7?VJOG{mP2gro*@TO2p7gCQw&3HIff@Iwfs66Oia?Er)O_-?HsDDZ
zQwN^s0L}Z0d#TJhFP8W**CLK~IyMaa01g9>{o%d-h2v)SQPLqV3^~xmU(jvIS^`#q
ztqw5tG`<2Re{CAtq_P_Pqb{Pgf^lgZ4t27|IzD+t_QJ8$BaoHzPGA(c6ieHE{UI=g
zv0I}GbWCMDj7S<av#;(?0mEJtZ@p3*zyL7h=~-;EHP0_eb7nRnsg`Y{Twqf(TWBY+
ziC5)8C;u7XzQ6F9>)QzMGDqm|&aYm`|1K=(W7!6v7adE0{XWT(llr|AHWSnrxixaR
zN4aPMuL{=XdPlj4OA~O~fvo^1yNT!Dv?7irj(k;89XRV%blc2UO5O9v)3>AnPv7^j
zvn^+9?IKrqfK5+jCI#i3#65ig3%1spPFhM$rKF_j2Z|*1^Ng7kq_LF&@e@tb!%?p<
y5v%x;vr=%s)vu^+*nbxZ8?^lg_8-{4Za)FSi<86v7ouAL0000<MNUMnLSTY3&a%}2

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/img/formatting.png b/addons/mail/static/src/img/formatting.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf45fdf192fa69cefa99a1c86369f1c3b04c2c96
GIT binary patch
literal 3466
zcmV;54R!K~P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk+
z4G0Pzw*`Fw01XOBL_t(o!;P40j9t}r$A4?@ea^Y(&Yic%9vkBa*oKZ1FeGkGC}8(N
zR7y&}*hw2mQz}vAArVnkRn-q3@+B=&C~cZ3ty=n_O&j5&fQS@PmGXv=VxYlxV*=PD
zcCkJ7yl3ut?7de%oI8V2E1Dyndv)$T_wIH6>%ac%zqX)HIsj#_fBLx>^gE9}!r0gl
z^Yb%w+9_3C5`2XLKrkwRf;vDz1uz60b<C+^q|@KVI;H3?5qw3OI_j$Az$ZWT+U~2b
z`6UtNCV_*{EUl=>*4D<2C*|?S35O2Rb{tx3I6CZ@#AjK?_HCE5ci#<Ut%SZTC4>r4
zoN*|MXcHos_X1OciXn<&sS8Oeq^VHX6-8Mx(CP5VqYrcEouA!x$8X<$MD-7Mi`;wW
z5VVhS(j)&STeh6ig9p*!Vch=xc*od8WG7xgo~}#syv3C}uD~L_#bbleN+2I_gaBAp
zf62<PHBgmHY}vG)#~=UR25anpsUE!Ho_plS2d_hBW{@p=Fdw}NI|6R~dW>P}fMNfE
zprB>dr7V`QSbX$&UlKz^6{1FBjA+p2^uR@D^h#YRq7Z_o4mBZ0>dI5sHN=`*Z@roE
z@iG4CTi+h|+Xw&dh5PT<YupI!J$sPxb@0TCxFaV>0PEJhb0`@-222nHPwh)Ui9ylW
zAYd_=6|{O3LmG0dd|(h-EqcM17z@M%UqN4|MLW;gym=EF4s7Gw|NLG4@_}#mZQZi|
ziK})z^V!QUz474#J2CxxFz0_6J#hqezj6b1?En$L8Nr$+Wl54X0VtqN2xu>vx)S3>
zQA%@PU6&vgg29-CR+@ss{M-WDwr*$5=w;ZrmVaOS1ULWcZLL>dJ^T-BQ1kg?9D3sz
z#qU3O7>53;&)s$zF&}HztLlofC>n0WCOzIO)<WXsy+BuxllQJw6{0801VqqSL$p|%
z5<Q%oI>Y?@43}Tt$8~$IBE-PR*d*6pdrk74hoAV?Cv@-lSLNNm9$<TR&+L{tw{r}>
ze;msdVu_FSPylPdIKdc@W-V0o{RJS+i>e|7Fg1(w=W(tkZDoL=E-KP?%DS<BKKF&+
z<)<eXh;<)jU9eDGAcV;8-F1h2qyF0ckLhpzxm@xXlMfsfHvr-40R%K8$-j~$DFEGW
zmsZxoh^(R`7o}_^r>cq=1tQT0T6r5W9%CFKWcb>UD(v6?DXy5<!ThXZ86s*)(pu)-
zbEo-}KmIe0zi}LZiMxKoPwvFJjo{~>L)Z^SEY2kjV%8F3z!;0h2t<rEgb=W%sXQZs
zF+z-ys`jKNgOG#99w#l%8Dgz$+PsTRn|A`qMFO+PTR%C>efNEX5NZIv{yUg$TM%=v
zOoqt=goY=ksYJjz+f<totg~2W5D`Q?B7(Dk@j$>BFvek$3@Z+NN~}{1mc$9mi=ZB2
zFhn03aU)X41?K0Lh#@u{2D%=79ioGSZYKwQui@Z*AcTPT6-i=QSe&M+s)l1RP}T*B
zb2w{RTwWq*q|+I|Xh!tQhzRX=KbcKei>O-&Nh^}(w)vkPJ)Ptvt{)=~?G@2|+b6?Q
z91QLzh<kg$`dUE+Yc19$_)zi4qYrcB$m`^Jj&qL1r6r1@qSa~>e8jnwfx%&Xthq2f
zg*A@bKYa(gKD>*C1tm{}HREvROwAyUylsgZu>_z6v4g0EUaQ;7LGvVs#k~P(Khz(A
zD5AvJ<g%)|q-krFPeVgP{M?m0K^#AL=@mp$T3H{%!)qB^J5K2rIDX;>oI3RmuN{4j
z&fpm1>oy=gIb5?Yr7VTzswPcKEP`UFYfp%Awb=J_49La#_u5)hd{KM4<N+bZ!1(xj
z_Wb<E_|S*0!3X8_*M7>>`6Xs+Ph$GG`olZfy2Enyo~``LBmc-;F~efHNGlWS=s7!e
zfwgN!N!t#z#4t-!$8CIA0*Qzzo2q0Y9s}dHLcOpeld2e_J@PxCV7a?Yk|d0-Sxcug
zfJX3DMrv~~ZQ9wTj0}u0Is~IbgA5ICr<GjF;J_vlATf^dbtANJ4d*07F(@^HLsmqR
zas?lq0Nk%}OyL}`7h?otB2Xcsgc#U4v6J)X=P1i2#nDHWmkgrA%uPpLK6Qd~?^ay0
z+0iw^6Hf_i1_zlt-KEoihR6cGs_3MHlts<eA01)$?h&9wVvdzzgk-ga90K<9rZ|`|
zFwr<HD~J(@6+YBBn{fTdKF);;XPKE<#@8SUXbWGa{O7Ajc=kVDC1ZrkFWbe;vgh;}
z3!KHVOy(9@Gk%W6#Tn*j2dO#3AN|2Evg_I#v9vHju{wfif~xd52Cz*XP_Njhs1cJm
zFgd9aybnN^(a|wRh7F;i9V4Ry#HvHkc{1_b^6_8b3t#*+SwGx;_uIVuT7@U&+AI3`
z@}G_|*nuy7@flt^I>X|uFnt#K2cVsTs_nJl2C=7}6xp|rdWHC*VZR}&X}k^z*5(+K
zQrCg1u5oEYhswXpQt@M!i(_1W<2t_ll~1z!2DtJXko^3r4X<^M&LC`?fahMgky~!a
zIe+dQx(my6I?aF8VIDC7ZCp)qayM&Uo@dnD%e^X1f_f%vC02`w0}ReJB<(I&AYg4l
zWSVw=L6*<bt==K;K&u0lo+mO5l;k<|4MVFR)Iz({C2P&1J))~X(1NIeh;7<IADr&T
zy2(jkQZI4~@3Ri5O3z&gAvAhZ*Cn+tnV8tY*w{Ld(5SgU+A4t>!Q-`NdcMR<hBNT_
zFMWdfg&6|#z%W4-r9z24Hfi`9WbQ>!$K=5e^zkB%D~&OdrYXi6`Z{gq<`!AMem$Ev
zZzao`g$p3+GSJ3QqbOxnA~wNT*mv^|rlw{n%2~i8qFAelRg5&5dJ&DBL>xcEp$gq@
z!R*W&Rn;ZN(4c5wxx2*4lkboZ_A$0`O^*}-C6X8+&myVw_!uAx?M@(Xw}1*`EiM6L
zq|q~g?*TtL_5TIdKy0m{+wJoF^Uw3jE3X2=*qU*Yq{Z}w^PE0?o?~y!ap&i5rN2E)
zD#M881YZz*L<smeM`8_mOHf=Byn^XbI<7e5TZpXN=za#o8Z$UDGQ^EH-N4w`82$YN
zpqBZ$MT)W@&xgp{+j!v_;jQBrs5GaKF;Zi(^Z_Z$%Tt)#lBX$xK^5vcG`bo<gRbb9
zynVJAr~en>FTPe)L=0J$vVQ$K1_y?))-_#3BZ8tBiZa1j*tX#cesaRH#0;~A#l;L!
z81CPIm5AVhh$6%gF~+T~(^LNNk!H@9)e&gL6TP4Og7+R(NRov9f%b~ke=plWyVJZU
zHX|Vru#B{FMu#9X0FDq86^k(eP(&im<yd2op7Jw^9tL&$dB_}+1Cd_7S4jvIMM07z
z7o`;H+LI=hvhX-(u+H-Kn`im^2M^I*yoBRFs)=+k7*3rm`Nr4ZqSbkqyYD{0#!Z7g
z@fJiPNn#tX8XZQPb?*9au^WC1byMt@$!2Fnz3)xUD`3RfOQrPSj)dSLv4o%)(=1a~
zUB3U)aptE3+jeYY`(*<}A2EsN_18~wX6lE0=8oG~Ki<fdO_~Qa;_x0~NHH{y_t!r|
zYtv4w8v{MsOH5f-6ur3;pxw?<1@CKA!CKQy>8j*;N{o@<16N+Th3`K0HBOv>?lQy*
zoCB9Yw}6@1bF5!G!omWixsoTI5Nb3y1PhuXJsrF0dfcgkemBKavX`eL93;<Mv|6pz
zz`U<1tCGYeq-l!~0##L@s^oc2w_8wEfljAQnp?I{D2vO@;E_2<6NoA#b}b8wkfdN-
zK~XLuV#!>a#3qO&#MlHj2zIcAxHp+f&apongeplA@;qM+%vwh~U)kk}SSxfooz)8J
z>*S<WXwq*Z)*1TRN{A~;ZV4461_GYcI+E0oXo84Cqu^YE7)uPR+}2qTa~)JOJmeaL
z0##M@kg0nLZwN8aExHtCfwgwEQUTJ;(aIB?Q7S);FpIMb7_)?tk|crJd%Vt~GLKLZ
zwWg>F%A#a`eu3aitZg24dYbz5VWN3R_lL;avSO!Otrpf=(lo`|1h6=p_O4y86C{YR
zDkIifj4=omRwB0N6+~>a?~ytN2OO<500C<fvb05(rle^?YAmkT0Y-jERa@rWK6%O+
zE>mcFR$bRDEiF;kCB{JQYpk`a+XhLJk!2~t$DWatW?H90wI;M2Wmyw^BL_x2kqR+$
zL|sC#Slfp)9ilG@!8iLPrb*>J`!>q`51m?YC&BeG8UW6pzreH4KHGB>fh0AQW!alE
zEk)7A`^dmRKZ#3w!*T3YZXnMxvaHSWqEeRzmt<ffDhot&jwnkQNlEM=iR}lUGdH`y
z-24>QHK{DPy~TmAR7|2qQBhUyyYH*3J7WLWnP&2V-#4dI7*fNf>e!+%s;M1pzOyLu
s{(DD<HYuPF-2WG<syvSNDNnlp0Wg_FOvGuT5dZ)H07*qoM6N<$g2y+5`Tzg`

literal 0
HcmV?d00001

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index c70aad56710..2b69bf21dda 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -45,6 +45,8 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
+<!--                         <field name="type" invisible="1"/>
+                        <field name="content_subtype" invisible="1"/> -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
@@ -55,10 +57,13 @@
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <div>
-                            <button icon="gtk-ok" name="send_mail" string="Post" type="object"/>
+                            <button name="send_mail" string="Post" type="object"/>
                             or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
+                            <!-- <button icon="../../../../../mail/static/src/img/checklist"
+                                type="object" name="checklist" string=""
+                                help="Add a checklist"/> -->
                             <a href="#" class="oe_mail_compose_message_checklist">
                                 <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
                                     title='Add a checklist'/>

From 26665b774376068a93b887a2818ae98a22f23ae7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:50:10 +0200
Subject: [PATCH 315/397] [IMP] after a module installation, reload the client
 and open the menu Feeds

bzr revid: rco@openerp.com-20120718135010-4933mmgw3n18epvy
---
 openerp/addons/base/module/module.py  | 28 +++------------------------
 openerp/addons/base/res/res_config.py | 12 ++++++++----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fde8fcf5b9a..1a0932ac7cf 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -363,8 +363,9 @@ class module(osv.osv):
         if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
             return config
 
-        # reload the client
-        menu_ids = self.root_menus(cr,uid,ids,context)
+        # reload the client; open the first available root menu
+        menu_obj = self.pool.get('ir.ui.menu')
+        menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
         return {
             'type': 'ir.actions.client',
             'tag': 'reload',
@@ -649,29 +650,6 @@ class module(osv.osv):
                     _logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
-    def root_menus(self, cr, uid, ids, context=None):
-        """ Return root menu ids the menus created by the modules whose ids are
-        provided.
-
-        :param list[int] ids: modules to get menus from
-        """
-        values = self.read(cr, uid, ids, ['name'], context=context)
-        module_names = [i['name'] for i in values]
-
-        ids = self.pool.get('ir.model.data').search(cr, uid, [ ('model', '=', 'ir.ui.menu'), ('module', 'in', module_names) ], context=context)
-        values = self.pool.get('ir.model.data').read(cr, uid, ids, ['res_id'], context=context)
-        all_menu_ids = [i['res_id'] for i in values]
-
-        root_menu_ids = []
-        for menu in self.pool.get('ir.ui.menu').browse(cr, uid, all_menu_ids, context=context):
-            while menu.parent_id:
-                menu = menu.parent_id
-            if not menu.id in root_menu_ids:
-                root_menu_ids.append((menu.sequence,menu.id))
-        root_menu_ids.sort()
-        root_menu_ids = [i[1] for i in root_menu_ids]
-        return root_menu_ids
-
 class module_dependency(osv.osv):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 9277184a822..3f4a052a36b 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -70,10 +70,14 @@ class res_config_configurable(osv.osv_memory):
             res = next.action_launch(context=context)
             res['nodestroy'] = False
             return res
-        #if there is no next action and if html is in the context: reload instead of closing
-        if context and 'html' in context:
-            return {'type' : 'ir.actions.reload'}
-        return {'type' : 'ir.actions.act_window_close'}
+        # reload the client; open the first available root menu
+        menu_obj = self.pool.get('ir.ui.menu')
+        menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+            'params': {'menu_id': menu_ids and menu_ids[0] or False},
+        }
 
     def start(self, cr, uid, ids, context=None):
         return self.next(cr, uid, ids, context)

From 531444a6f6b1d94e8ab4893a8f976e32e038bfff Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:51:02 +0200
Subject: [PATCH 316/397] [IMP] account: do not open a non-existing view after
 setting taxes

bzr revid: rco@openerp.com-20120718135102-34gvep3dbpqznozc
---
 addons/account/account.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6fd7232a25..fab9de5407c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
-        action = {
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'board.board',
-            'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
-            'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
-        }
-        return action
+        return {}
 
     def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
         '''

From bfe3afcbd8ac214487c57731c850c199f8a6a3c5 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 18 Jul 2012 15:55:03 +0200
Subject: [PATCH 317/397] improved project kanban vignette

bzr revid: mit@openerp.com-20120718135503-gi222ulbtmhyesq8
---
 addons/web_kanban/static/src/css/kanban.css  | 3 +++
 addons/web_kanban/static/src/css/kanban.sass | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 36dbab57559..5a7c1b84067 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -401,6 +401,9 @@
   position: relative;
   top: 2px;
 }
+.openerp .oe_kanban_view .oe_kanban_project_times li {
+  float: left;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   position: relative;
   top: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index f4c13cc7bd2..cea95f2ce53 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -336,6 +336,9 @@
         float: right
         position: relative
         top: 2px
+
+    .oe_kanban_project_times li
+        float: left
        
     .oe_kanban_status
         position: relative

From 607c1670314a00cb3cd5b28ba495f950104d776f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 18 Jul 2012 15:55:14 +0200
Subject: [PATCH 318/397] improved project kanban vignette

bzr revid: mit@openerp.com-20120718135514-ojyvli4qyresvsmf
---
 addons/project/project_view.xml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a70bc504299..dbc4007bf8c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -521,6 +521,15 @@
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
+                                    <li>
+                                      <ul class="oe_kanban_project_times">
+                                        <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
+                                        <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
+                                        <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
+                                        <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
+                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
+                                      </ul>
+                                    </li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
@@ -531,19 +540,6 @@
                                     <field name="project_id"/>
                                     <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
                                     <i><field name="date_deadline"/></i>
-                                    <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
-                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
-                                                <t t-set="times" t-value="[
-                                                     [1, (hours gte 1 and hours lt 2)]
-                                                    ,[2, (hours gte 2 and hours lt 5)]
-                                                    ,[5, (hours gte 5 and hours lt 10)]
-                                                    ,[10, (hours gte 10)]
-                                                ]"/>
-                                                <t t-foreach="times" t-as="time"><a 
-                                                    t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
-                                                    t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
-                                                <a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
-                                    </span>
                                 </div>
 
                                 <div class="oe_kanban_bottom_right">
@@ -554,6 +550,12 @@
                                     <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
+                                <div class="oe_kanban_footer_left">
+                                    <span>
+                                        <span class="oe_e">N</span>
+                                        <t t-esc="Math.round(record.remaining_hours.raw_value)"/>
+                                    </span>
+                                </div>
                             </div>
                             <div class="oe_clear"></div>
                         </div>

From a824028878037b2e1bac655390ea77808feb7c11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 18 Jul 2012 16:06:13 +0200
Subject: [PATCH 319/397] [IMP] initial mail message sale

bzr revid: fp@tinyerp.com-20120718140613-3urmqhtng63lc23f
---
 addons/sale/sale_data.xml               | 26 +++++++++++++++++++++++++
 addons/sale/wizard/sale_make_invoice.py |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4622577ac3d..b0fd5ed6d10 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -26,5 +26,31 @@
 
         <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
+            
+        <record id="message_welcome_sale" model="mail.message">
+            <field name="subject">Module sale installed!</field>
+            <field name="type">comment</field>
+            <field name="subtype">html</field>
+            <field name="body_text">Welcome to OpenERP
+                Second Line
+            </field>
+            <field name="body_html" type="xml">
+                <h2>OpenERP Sale module just installed!</h2>
+                <p>
+                    You can click on the top menu <b>Sales</b> to manage your
+                    customers, your quotations and sales orders.
+                </p>
+                <p>
+                    If you need to manage your sales pipeline (leads,
+                    opportunities, phonecalls), you can install the CRM module
+                    from the <b>Settings</b> top menu.
+                </p>
+            </field>
+        </record>
+        <record id="message_welcome_sale_root" model="mail.notification">
+            <field name="user_id" ref="base.user_root"/>
+            <field name="message_id" ref="message_welcome_sale"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 5265afb9bff..b4b3772a91a 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory):
 
 sale_make_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 5510ee74b2f97959d129aa4e45933bd65bd42981 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:11:12 +0200
Subject: [PATCH 320/397] [IMP] sale: in customer form, move action 'Quotations
 and Sales' from contextual menu to button

bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3
---
 addons/sale/res_partner_view.xml | 34 +++++++++++++++++++++++++++++++-
 addons/sale/sale_view.xml        |  8 --------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index bb5695eac39..9c557620e75 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <!-- Partner kanban view inherte -->
+        <record id="act_res_partner_2_sale_order" model="ir.actions.act_window">
+            <field name="name">Quotations and Sales</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
+            <field name="help">
+                This customer has no quotation or sale order.
+                Click here to create a new quotation.
+                &lt;p&gt;
+                The "Quotation" is the first step of the Sales flow.  Manage your sales from quotation to invoice.
+                &lt;p&gt;
+                You will be able to sell products (manage deliveries) as well as services (create projects).
+            </field>
+        </record>
+
+        <!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.saleorder.inherit</field>
             <field name="model">res.partner</field>
@@ -18,6 +35,21 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="res_partner_view_buttons" model="ir.ui.view">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
+                        string="Quotations and Sales"
+                        groups="base.group_sale_salesman"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 619ea161f28..aa30f023ae8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -569,14 +569,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window
-            context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-            id="act_res_partner_2_sale_order"
-            name="Quotations and Sales"
-            groups="base.group_sale_salesman"
-            res_model="sale.order"
-            src_model="res.partner"/>
-
         <act_window
             context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
             id="action_order_line_product_tree"

From 51f5471b83b7c8ff70a4e9a1c1026f72bb13f8cb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 16:12:54 +0200
Subject: [PATCH 321/397] [FIX] account: fixed untested code (that certainly
 never worked) when creating a cash register \!\!\!

bzr revid: qdp-launchpad@openerp.com-20120718141254-vy7cinlhy39c4295
---
 addons/account/account_cash_statement.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index bea48528f63..927ce94db31 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -132,18 +132,18 @@ class account_cash_statement(osv.osv):
 
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'draft':
-                self.search(cr, uid,
-                    [('journal_id', '=', journal_id),('state', '=', 'confirm')],
+                statement_ids = self.search(cr, uid,
+                    [('journal_id', '=', obj.journal_id.id),('state', '=', 'confirm')],
                     order='create_date desc',
                     limit=1,
                     context=context
                 )
 
                 if not statement_ids:
-                    return result
-
-                st = self.browse(cr, uid, statement_ids[0], context=context)
-                result[obj.id] = st.balance_end_real
+                    continue
+                else:
+                    st = self.browse(cr, uid, statement_ids[0], context=context)
+                    result[obj.id] = st.balance_end_real
 
         return result
 

From 8ac5c9c0ac978d50d637b79ceaaaf5676a19a3be Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:14:36 +0200
Subject: [PATCH 322/397] [IMP] crm, sale: put priorities in inherited views to
 control the order of buttons

bzr revid: rco@openerp.com-20120718141436-k19c7g3lz5gu2iqo
---
 addons/crm/res_partner_view.xml  | 1 +
 addons/sale/res_partner_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 29e733e2496..482a0d37e97 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -123,6 +123,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="10">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 9c557620e75..55a049376bd 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -41,6 +41,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="20">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"

From e0aafd1c5ebffe791fddf07c01b71b1cc52cd24a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Jul 2012 16:22:35 +0200
Subject: [PATCH 323/397] [FIX] Disable cache middleware for debug mode

bzr revid: al@openerp.com-20120718142235-x4uwzsar7ak6sxgk
---
 addons/web/common/http.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index cc76a554693..7b73c2169ea 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -417,6 +417,20 @@ class ControllerType(type):
 class Controller(object):
     __metaclass__ = ControllerType
 
+class DisableCacheMiddleware(object):
+    def __init__(self, app):
+        self.app = app
+    def __call__(self, environ, start_response):
+        def start_wrapped(status, headers):
+            debug = environ.get('HTTP_REFERER', '').find('debug') != -1
+            filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
+            if debug:
+                filtered_headers.append(('Cache-Control', 'no-cache'))
+            print headers
+            print filtered_headers
+            start_response(status, filtered_headers)
+        return self.app(environ, start_wrapped)
+
 class Root(object):
     """Root WSGI application for the OpenERP Web Client.
 
@@ -452,8 +466,8 @@ class Root(object):
 
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
-            self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
-                self.dispatch, static_dirs, cache=False)
+            app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
+            self.dispatch = DisableCacheMiddleware(app)
 
         if options.session_storage:
             if not os.path.exists(options.session_storage):

From e2e15fe6347b9a484cf1bc1568e18219c6f77e3a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:25:24 +0200
Subject: [PATCH 324/397] [FIX] crm, sale: fix xml missing end tag

bzr revid: rco@openerp.com-20120718142524-7mw10njirqy70tkd
---
 addons/crm/res_partner_view.xml  | 2 +-
 addons/sale/res_partner_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 482a0d37e97..26c74427009 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -123,7 +123,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="10">
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 55a049376bd..11ac318b7a7 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -41,7 +41,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20">
+            <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"

From be4e0b19a8881ec6a4b7eb214205be3644509640 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Jul 2012 16:25:34 +0200
Subject: [PATCH 325/397] [FIX] remove print statements

bzr revid: al@openerp.com-20120718142534-lbanv7do95szh4j5
---
 addons/web/common/http.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 7b73c2169ea..87748d2e6d9 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -426,8 +426,6 @@ class DisableCacheMiddleware(object):
             filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
             if debug:
                 filtered_headers.append(('Cache-Control', 'no-cache'))
-            print headers
-            print filtered_headers
             start_response(status, filtered_headers)
         return self.app(environ, start_wrapped)
 

From 13f368707df5ebae09d79f87b899a34cf8f62a35 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 18 Jul 2012 16:28:10 +0200
Subject: [PATCH 326/397] [IMP] accounting: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120718142810-guj4aekt9v02jgfw
---
 addons/account/account_view.xml               | 104 ++++++++----------
 addons/account/project/project_view.xml       |   2 +-
 .../account/test/account_cash_statement.yml   |   2 +-
 .../account_automatic_reconcile_view.xml      |   2 +
 .../wizard/account_fiscalyear_close_view.xml  |   2 +
 .../account_payment/account_payment_view.xml  |  13 ++-
 addons/account_sequence/account_sequence.xml  |   2 +-
 7 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ecdcdaf4924..1e1f7b91851 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -466,62 +466,61 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
                     <group>
-                        <field name="name"/>
-                        <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        <group>
+                            <field name="code"/>
+                            <field name="type" on_change="onchange_type(type, currency, context)"/>
+                        </group>
+                        <group>
+                            <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="currency"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
                     </group>
                     <notebook>
-                        <page string="Journal Configuration">
+                        <page string="Advanced Settings">
                             <group>
                                 <group>
-                                    <field name="code"/>
-                                    <field name="currency"/>
-                                </group>
-                                <group>
-                                    <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="user_id"/>
-                                </group>
-                                <group>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                     <field name="view_id" widget="selection"/>
-                                        <field name="sequence_id" required="0"/>
+                                    <field name="sequence_id" required="0"/>
                                 </group>
                                 <group>
                                     <field name="centralisation"/>
                                     <field name="entry_posted"/>
-                                    <field name="with_last_closing_balance" />
                                     <field name="allow_date"/>
                                     <field name="group_invoice_lines"/>
                                 </group>
-                                <group>
-                                    <field name="type_control_ids" widget="many2many_tags"/>
-                                    <field name="account_control_ids" widget="many2many_tags"/>
+                            </group>
+                        </page>
+                        <page string="Entry Controls">
+                            <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
+                            <field colspan="4" name="type_control_ids" nolabel="1"/>
+                            <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
+                            <field colspan="4" name="account_control_ids" nolabel="1"/>
+                        </page>
+                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                            <group>
+                                <group string="Accounts">
+                                    <field name="profit_account_id"/>
+                                    <field name="loss_account_id"/>
+                                    <field name="internal_account_id"/>
+                                </group>
+                                <group string="Miscellaneous">
+                                    <field name="with_last_closing_balance"/>
                                 </group>
                             </group>
-                            <page string="Entry Controls">
-                                <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
-                                <field colspan="4" name="type_control_ids" nolabel="1"/>
-                                <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
-                                <field colspan="4" name="account_control_ids" nolabel="1"/>
-                            </page>
-                            <page string="Cash">
-                                <group string="Profit &amp; Loss Accounts">
-                                    <field name="profit_account_id" />
-                                    <field name="loss_account_id" />
-                                </group>
-
-                                <group string="Internal Transfer Account">
-                                    <field name="internal_account_id" />
-                                </group>
-
-                                <separator string="Available Currencies" colspan="4" />
-                                <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
-                                    <tree string="CashBox Lines" editable="bottom">
-                                        <field name="pieces" />
-                                    </tree>
-                                </field>
-                            </page>
+                            <separator string="Available Coins" colspan="4" />
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                                <tree string="CashBox Lines" editable="bottom">
+                                    <field name="pieces" />
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -625,9 +624,9 @@
                     <div class="oe_right oe_button_box" name="import_buttons">
                        <!-- Put here related buttons -->
                     </div>
-                    <label for="name" class="oe_edit_only"/>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>
+                        <field name="name" attrs="{'invisible':[('name','=','/')]}"/>
                     </h1>
                     <group>
                         <group>
@@ -1086,40 +1085,33 @@
 	                                    <field name="credit"/>
 	                                    <field name="quantity"/>
 	                                </group>
-	
 	                                <group string="Accounting Documents">
 	                                    <field name="invoice" readonly="True"/>
 	                                    <field name="move_id" required="False"/>
 	                                    <field name="statement_id" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Dates">
 	                                    <field name="date"/>
 	                                    <field name="date_maturity"/>
 	                                    <field name="date_created" readonly="True"/>
 	                                </group>
-	
 	                                <group string="Taxes">
 	                                    <field name="tax_code_id"/>
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	
 	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
 	                                    <field name="currency_id"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
-	
 	                                <group string="Reconciliation">
 	                                    <field name="reconcile_id"/>
 	                                    <field name="reconcile_partial_id"/>
 	                                </group>
-	
 	                                <group string="States">
 	                                    <field name="state"/>
 	                                    <field name="blocked"/>
 	                                </group>
-	
 	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
 	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
 	                                </group>
@@ -1330,9 +1322,12 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1>
+                        <field name="name" readonly="True" attrs="{'invisible':[('name','=','/')]}"/>
+                    </h1>
                     <group>
                         <group>
-                            <field name="name" readonly="True"/>
                             <field name="journal_id"/>
                             <field name="period_id"/>
                             <field name="company_id" required="1" groups="base.group_multi_company"/>
@@ -2602,14 +2597,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" class="oe_inline"/></h1>
-                    <label for="journal_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                    </h2>
+                    <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
+                    <h1><field name="name" class="oe_inline" attrs="{'invisible':[('name','=','/')]}"/></h1>
                     <group>
                         <group>
+                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                             <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 492ab249a39..5c1542abc29 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -385,7 +385,7 @@
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="currency" position="after">
+                <field name="type" position="after">
                     <field name="analytic_journal_id"/>
                 </field>
             </field>
diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml
index 5ead46522bd..6bff530bb54 100644
--- a/addons/account/test/account_cash_statement.yml
+++ b/addons/account/test/account_cash_statement.yml
@@ -1,5 +1,5 @@
 -
-  In order to test Cash statement I create a Cash statement and confirm it and check it's move created
+  In order to test Cash statement I create a Cash statement and confirm it and check its move created
 -
  !record {model: account.bank.statement, id: account_bank_statement_1}:
     date: !eval time.strftime('%Y-%m-%d')
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index b7a22ea9fa8..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,6 +8,8 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
+                    <separator string="Reconciliation"/>
+                    <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
                     <group col="4">
                         <field name="power"/>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 43850237263..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,6 +7,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
+                    <separator string="Generate Fiscal Year Opening Entries"/>
+                    <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
                     <group col="4">
                         <field name="fy_id" domain = "[('state','=','draft')]"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index cae9efcd515..1577d1b86bd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -113,13 +113,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order">
+                    <div class="oe_button_box">
+                        <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    </div>
+                    <div class="oe_title">
+                        <label for="reference" class="oe_edit_only"/>
+                        <h1><field name="reference"/></h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="reference"/>
                             <field name="user_id"/>
                             <field name="mode"/>
-                            <button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                         </group>
                         <group>
                             <field name="date_prefered"/>
@@ -181,8 +186,6 @@
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
                     </field>
-                    <field name="date_created"/>
-                    <field name="date_done"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index a82a041d6ec..3ed16cfa58e 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -44,7 +44,7 @@
             <field name="inherit_id" ref="account.view_account_move_filter"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='name']" position="before">
+                <xpath expr="//field[@name='name']" position="after">
                     <field name="internal_sequence_number"/>
                 </xpath>
             </data>

From 97bbacfaf01a2a954b254fd6a4588cccb89a989d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Jul 2012 04:46:00 +0000
Subject: [PATCH 327/397] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120719044600-emnku3b8yb0nxddf
---
 openerp/addons/base/i18n/ab.po       |   4 +-
 openerp/addons/base/i18n/af.po       |   4 +-
 openerp/addons/base/i18n/am.po       |   4 +-
 openerp/addons/base/i18n/ar.po       |   8 +-
 openerp/addons/base/i18n/bg.po       |   4 +-
 openerp/addons/base/i18n/bs.po       |   4 +-
 openerp/addons/base/i18n/ca.po       |   4 +-
 openerp/addons/base/i18n/cs.po       |   4 +-
 openerp/addons/base/i18n/da.po       |   4 +-
 openerp/addons/base/i18n/de.po       | 923 ++++++++++++++++++++++++---
 openerp/addons/base/i18n/el.po       |   4 +-
 openerp/addons/base/i18n/en_GB.po    |   4 +-
 openerp/addons/base/i18n/es.po       |   4 +-
 openerp/addons/base/i18n/es_AR.po    |   4 +-
 openerp/addons/base/i18n/es_CL.po    |   4 +-
 openerp/addons/base/i18n/es_CR.po    |   4 +-
 openerp/addons/base/i18n/es_EC.po    |   4 +-
 openerp/addons/base/i18n/et.po       |   4 +-
 openerp/addons/base/i18n/eu.po       |   4 +-
 openerp/addons/base/i18n/fa.po       |   4 +-
 openerp/addons/base/i18n/fa_AF.po    |   4 +-
 openerp/addons/base/i18n/fi.po       |   4 +-
 openerp/addons/base/i18n/fr.po       |  81 ++-
 openerp/addons/base/i18n/gl.po       |   4 +-
 openerp/addons/base/i18n/gu.po       |   4 +-
 openerp/addons/base/i18n/he.po       |   4 +-
 openerp/addons/base/i18n/hr.po       |   4 +-
 openerp/addons/base/i18n/hu.po       |   4 +-
 openerp/addons/base/i18n/hy.po       |   4 +-
 openerp/addons/base/i18n/id.po       |   4 +-
 openerp/addons/base/i18n/is.po       |   4 +-
 openerp/addons/base/i18n/it.po       |   4 +-
 openerp/addons/base/i18n/ja.po       |   4 +-
 openerp/addons/base/i18n/ka.po       |   4 +-
 openerp/addons/base/i18n/kk.po       |   4 +-
 openerp/addons/base/i18n/ko.po       |   4 +-
 openerp/addons/base/i18n/lt.po       |   4 +-
 openerp/addons/base/i18n/lv.po       |  72 ++-
 openerp/addons/base/i18n/mk.po       |   4 +-
 openerp/addons/base/i18n/mn.po       | 368 ++++++++++-
 openerp/addons/base/i18n/nb.po       |   4 +-
 openerp/addons/base/i18n/nl.po       |   6 +-
 openerp/addons/base/i18n/nl_BE.po    |   4 +-
 openerp/addons/base/i18n/pl.po       |   4 +-
 openerp/addons/base/i18n/pt.po       |   4 +-
 openerp/addons/base/i18n/pt_BR.po    |   4 +-
 openerp/addons/base/i18n/ro.po       |   4 +-
 openerp/addons/base/i18n/ru.po       |   4 +-
 openerp/addons/base/i18n/sk.po       |   4 +-
 openerp/addons/base/i18n/sl.po       |   4 +-
 openerp/addons/base/i18n/sq.po       |   4 +-
 openerp/addons/base/i18n/sr.po       |   4 +-
 openerp/addons/base/i18n/sr@latin.po |   4 +-
 openerp/addons/base/i18n/sv.po       | 141 ++--
 openerp/addons/base/i18n/th.po       |   4 +-
 openerp/addons/base/i18n/tlh.po      |   4 +-
 openerp/addons/base/i18n/tr.po       |   4 +-
 openerp/addons/base/i18n/uk.po       |   4 +-
 openerp/addons/base/i18n/ur.po       |   4 +-
 openerp/addons/base/i18n/vi.po       |   4 +-
 openerp/addons/base/i18n/zh_CN.po    |   4 +-
 openerp/addons/base/i18n/zh_HK.po    |   4 +-
 openerp/addons/base/i18n/zh_TW.po    |   4 +-
 63 files changed, 1528 insertions(+), 295 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 3863eeeb3e9..e7888a8a720 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index afa156164f2..4f2dd5fb776 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index c7d08cdb7ed..1ccb028cac0 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 1b8a8314f6d..1a2642d9e1f 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -4155,7 +4155,9 @@ msgstr ""
 msgid ""
 "Your OpenERP Publisher's Warranty Contract unique key, also called serial "
 "number."
-msgstr "شفرة ضمان الناشر لأوبنيرب."
+msgstr ""
+"رمز اتفاقية ضمان الناشر الخاص بك لنظام أوبن إي آر بي، يدعى أيضاً الرقم "
+"التسلسلي."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 1eb843e2024..ab9556f269c 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index bc4ba16f8c8..778679bb04d 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index c138fdcc5ef..fa5f95b14da 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index a04a19a13d7..4819a321dda 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index f0b7a105877..2710b5c4629 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index e4d2feeccac..9db01f56eb0 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/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-07-07 05:12+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -72,6 +72,20 @@ msgid ""
 "    * Graph of My Remaining Hours by Project\n"
 "    "
 msgstr ""
+"\n"
+"Das Projektmanagement-Modul verwaltet mehrstufige Projekte, Aufgaben, "
+"Aufgabenerfolge, usw.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Es ist in der Lage Planung, Aufgabenreihenfolge usw. zu errechnen.\n"
+"\n"
+"Es bietet eine Pinnwand für Projektteilnehmer mit:\n"
+"    * Liste der ausstehenden Aufgaben\n"
+"    * Liste der zugewiesenen Aufgaben\n"
+"    * Graph von \"Meine Aufgaben : Geplant vs. Gesamtstunden\"\n"
+"    * Graph von \"Meine verbleibenden Stunden per Projekt\"\n"
+"    "
 
 #. module: base
 #: field:base.language.import,code:0
@@ -184,7 +198,7 @@ msgstr "Zielzeitraum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
 msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Kostenverrechnung des Verkaufs"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_process
@@ -194,7 +208,7 @@ msgstr "Prozess"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
 msgid "Billing Rates on Contracts"
-msgstr ""
+msgstr "Verrechnungssätze in Verträgen"
 
 #. module: base
 #: code:addons/base/res/res_users.py:558
@@ -228,7 +242,7 @@ msgstr "ir.ui.view.custom"
 #: code:addons/base/ir/ir_model.py:313
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "Umbenennen des Ersatzfeldes \"%s\" ist nicht erlaubt"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -356,6 +370,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"Bei Aktionen eine der folgenen Wahlmöglichkeiten: \n"
+"  -client_action_multi\n"
+"  -client_print_multi\n"
+"  -client_action_relate\n"
+"  -tree_but_open\n"
+"Bei Vorgabefeldern eine wahlfreie Einstellung"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -370,6 +390,11 @@ msgid ""
 "        complex data from other software\n"
 "    "
 msgstr ""
+"\n"
+"        Dieses Modul bietet eine Klasse import_framework, welche beim Import "
+"\n"
+"        komplexer Daten aus anderen Anwendungen behilflich ist\n"
+"    "
 
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
@@ -631,6 +656,30 @@ msgid ""
 "    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
 "\n"
 msgstr ""
+"\n"
+"Modul zum automatisieren der Anschreiben für ein mehrstufiges Mahnwesen.\n"
+"=================================================================\n"
+"\n"
+"Sie können mehrere Mahnstufen über das Menü:\n"
+"    Finanzen/Konfiguration/Weitere Einstellungen/Erinnerungen\n"
+"\n"
+"Einmal eingerichtet können Sie auf täglicher Basis automatisch "
+"Zahlungserinnerungen drucken, über das Menü:\n"
+"    Finanzen/Periodische Buchungen/Zahlungserinnerungen/Sende "
+"Zahlungserinnerung\n"
+"\n"
+"Dies generiert ein PDF mit allen Briefen in den jeweils definierten "
+"Mahnstufen. Sie können verschiedene\n"
+"Verfahrensvorschriften für unterschiedliche Unternehmen definieren. Sie "
+"können auch eMail an den\n"
+"Kunden versenden.\n"
+"\n"
+"Beachten Sie, dass Sie die Mahnstufe eines Partners/Kontos überprüfen "
+"möchten können Sie diese über das Menü\n"
+"    Finanzen/Berichtswesen/Standard Auswertungen/Partner/Versendete "
+"Erinnerungen\n"
+"einsehen.\n"
+"\n"
 
 #. module: base
 #: field:res.country,name:0
@@ -921,6 +970,15 @@ msgid ""
 "delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul lässt den Administrator alle Benutzeraktivitäten an allen "
+"Objekten des Systems verfolgen.\n"
+"============================================================================="
+"========\n"
+"\n"
+"Der Administrator kann sich selbst Regeln für das Lesen, Schreiben und \n"
+"Löschen von Objekten zulassen und kann Protokolle einsehen.\n"
+"    "
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -1184,6 +1242,25 @@ msgid ""
 "At the end of the month, the planning manager can also check if the encoded "
 "timesheets are respecting the planned time on each analytic account.\n"
 msgstr ""
+"Gehen Sie Ihrer Planung nach\n"
+"Dieses Modul hilft Ihnen Ihre Planung zu Verwalten.\n"
+"===========================================\n"
+"\n"
+"Dieses Modul basiert auf dem Kostenstellen-Modul und ist vollständig "
+"integriert in\n"
+"* die Stundennachweisverwaltung\n"
+"* die Feiertagsverwaltung\n"
+"* die Projektverwaltung\n"
+"\n"
+"Jeder Abteilungsleiter kann so erfahren kann, ob ein Mitarbeiter seines "
+"Teams noch verfügbare\n"
+"Zeit für eine gegebene Planung (und unter Berücksichtigung von genehmigtem "
+"Urlaub) hat, oder\n"
+"ob er noch zu erledigende Aufgaben eröffnen muss.\n"
+"\n"
+"Am Ende des Monats kann der Planungsverantwortliche auch überprüfen, ob die "
+"eingereichten \n"
+"Stundenachweise die zugerechnete Zeit der Kostenstellen berücksichtigen.\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1356,7 +1433,7 @@ msgstr "Dokumentenverwaltungssystem"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Nachforderungsmanagement"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1405,6 +1482,14 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"Zusätzliche Datumseinträge für Verkaufsaufträge.\n"
+"===========================================\n"
+"\n"
+"Sie können zusätzlich die folgenden Daten einem Verkaufsauftrag hinzufügen:\n"
+"    * Anforderungsdatum\n"
+"    * Zusagedatum\n"
+"    * Wirksamkeitsdatum\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -1446,6 +1531,27 @@ msgid ""
 "database,\n"
 "      but in the servers rootpad like /server/bin/filestore.\n"
 msgstr ""
+"\n"
+"Dies ist ein vollständiges Dokumenten-Verwaltungs-System.\n"
+"===================================================\n"
+"\n"
+"    * Benutzer Legitimation\n"
+"    * Dokumentenindizierung: *.pptx und *.docx von der Windows-Plattform "
+"werden nicht unterstützt.\n"
+"    * Pinnwand für Dokumente einschließlich:\n"
+"        * Neue Dateien (Liste)\n"
+"        *  Dateien nach Typ (Diagramm)\n"
+"        * Dateien nach Partner (Diagramm)\n"
+"        * Dateigrößen nach Monat (Diagramm)\n"
+"\n"
+"ACHTUNG:\n"
+"    - Wenn Sie dieses Modul in einem laufenden System, mit bereits in der "
+"Datenbank abgespeicherten \n"
+"      PDF-Dateien installieren, werden Sie diese alle verlieren.\n"
+"    - Nach der Installation dieses Moduls werden PDF-Dateien nicht mehr in "
+"die Datenbank eingelagert,\n"
+"      sondern im Stammverzeichnis des Servers, z. B. /server/bin/filestore  "
+"abgelegt\n"
 
 #. module: base
 #: view:res.lang:0
@@ -1514,6 +1620,15 @@ msgid ""
 "Web.\n"
 "    "
 msgstr ""
+"\n"
+"Dies ist ein Testmodul welches HTML-Tag-Unterstützung in normaler XML-"
+"Formularsicht zeigt.\n"
+"============================================================================="
+"==\n"
+"\n"
+"Erzeugt ein Beispiel einer Formaularsicht unter Verwendung von HTML-Tags. \n"
+"Es ist nur in OpenERP Web darstellbar.\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_purchase_management
@@ -1521,6 +1636,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Unterstützung aller Beschaffungsvorgänge, wie z. B. Angebotsanfragen, "
+"Bestellungen und Lieferanteneingangsrechnungen, usw...."
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1608,6 +1725,20 @@ msgid ""
 "    - You can define new types of events in\n"
 "        Association / Configuration / Types of Events\n"
 msgstr ""
+"\n"
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"==========================================\n"
+"\n"
+"Dieses Modul ermöglich Ihnen\n"
+"    * Ihre Veranstaltungen und deren Anmeldungen zu verwalten\n"
+"    * eMails zu verwenden, um Anmeldungen zu einer Veranstaltung automatisch "
+"zu bestätigen\n"
+"    * ...\n"
+"\n"
+"Beachten Sie:\n"
+"    - Sie können neue Arten von Veranstaltungen im Menü\n"
+"        Gesellschaft/Konfiguration/Arten von Veranstaltungen\n"
+"       festlegen\n"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -1712,6 +1843,26 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Werkzeug fügt allgemeine Freigaben-Hilfsmittel Ihrer OpenERP-"
+"Datenbank hinzu.\n"
+"=======================================================================\n"
+"\n"
+"Insbesondere wird der Web-Oberfläche ein \"Freigeben\"-Button hinzugefügt, "
+"um alle Arten \n"
+"von OpenERP-Daten mit Kollegen, Kunden, Freunden usw. zu teilen.\n"
+"\n"
+"Das System funktioniert durch kurzfristige Einrichtung von Benutzern und "
+"Benutzergruppen\n"
+"und durch passende Kombination von Zugriffsrechten und ir.rules-Regeln um "
+"sicherzustellen, \n"
+"dass nur die freigegebenen Benutzer Zugriff zu den Daten erhalten.\n"
+"\n"
+"Dies ist ausserordentlich nützlich für Arbeitsgruppen, Mitteilung von "
+"Wissen,\n"
+"Abgleich/Synchronisation mit anderen Unternehmen usw.\n"
+"\n"
+"    "
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -1794,6 +1945,43 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Validierung von USt-Identnummern von Partnern\n"
+"=========================================\n"
+"\n"
+"Nach der Installation dieses Moduls werden Eintragungen im UStId. -Feld der "
+"Partner\n"
+"aus unterstützten Ländern auf Gültigkeit geprüft. Das Land wird aus dem 2\n"
+"Buchstaben umfassenden Ländercode hergeleitet, das der UStId.-Nummer\n"
+"vorangestellt ist, z. B. wird 'DE4711471147' nach deutschen Regeln geprüft.\n"
+"\n"
+"Es gibt zwei Ausprägungen der Umsatzsteueridentnummern-Prüfung:\n"
+"\n"
+" * Per Vorgabe wird eine einfache off-line Überprüfung unter Anwendung "
+"bekannter\n"
+"   landesspezifischer Regeln durchgeführt für gewöhnlich eine einfache "
+"Ziffernkontrolle.\n"
+"   Dies ist schnell und jederzeit verfügbar, erlaubt jedoch auch nicht "
+"zugewiesene \n"
+"   oder mittlerweile ungültige Nummern.\n"
+" * Wenn die \"UStId Prüfung nach VIES\" aktiviert ist (in den Einstellungen "
+"des jeweiligen \n"
+"   Unternehmens), wird stattdessen die UStId-Nummer on-line an die EU VIES\n"
+"   Datenbank übermittelt. Aus dieser Übertragung wird die Gültigkeit dieser\n"
+"   Nummer bestätigt.Dies ist etwas langsamer als die Einfachprüfung, "
+"erfordert eine \n"
+"   Internetverbindung und mag nicht jederzeit zur Verfügung stehen. Sollte "
+"der\n"
+"   on-line Dienst nicht verfügbar sein oder für dieses Land nicht existieren "
+"(z. B.\n"
+"   für nicht-EU-Länder), so wird auf die Einfachprüfung zurückgegriffen.\n"
+"\n"
+"Unterstützt werden gegenwärtig alle EU-Länder und ein paar nicht-EU-Länder,\n"
+"wie z. B. Chile, Kulumbien, Mexiko, Norwegen und Russland. Bei nicht "
+"unterstützten\n"
+"Ländern wird lediglich der Landesschlüssel überprüft.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.sequence:0
@@ -1831,6 +2019,19 @@ msgid ""
 "The managers can obtain an easy view of best ideas from all the users.\n"
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht dem Benutzer auf effiziente Weise an Unternehmens-"
+"Innovation teilzuhaben.\n"
+"============================================================================="
+"========\n"
+"\n"
+"Es ermöglicht jedem Ideen zu unterschiedlichen Themen mitzuteilen.\n"
+"Daraufhin können andere Benutzer diese kommentieren und darüber abstimmen.\n"
+"Jede Idee erhält aus den Abstimmungen abgeleitete Bewertungen.\n"
+"Die Manager erhalten eine einfache Übersicht über die besten Ideen aller "
+"Benutzer.\n"
+"Nach der Installation schauen Sie bitte in das Menü Ideen im Werkzeug-Haupt-"
+"Menü."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1866,6 +2067,7 @@ msgstr "Unternehmens Prozess"
 #: help:ir.cron,function:0
 msgid "Name of the method to be called when this job is processed."
 msgstr ""
+"Name der aufzurufenden Methode, wenn diese Aufgabe abgearbeitet wird."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
@@ -1887,7 +2089,7 @@ msgstr " (Kopie)"
 #. module: base
 #: field:res.company,rml_footer1:0
 msgid "General Information Footer"
-msgstr ""
+msgstr "Fusszeile mit allgemein gültiger Information"
 
 #. module: base
 #: view:res.lang:0
@@ -1986,6 +2188,12 @@ msgid ""
 "Accounting chart and localization for Ecuador.\n"
 "    "
 msgstr ""
+"\n"
+"Dies ist das Haupt-Modul der Buchführung für Ecuador mit OpenERP.\n"
+"============================================================\n"
+"\n"
+"Kontenplan und Landesanpassungen für Ecuador.\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:38
@@ -2104,7 +2312,7 @@ msgstr "Baum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_multicurrency
 msgid "Multi-Currency in Analytic"
-msgstr ""
+msgstr "Mehrfachwährungen in Kostenstellen"
 
 #. module: base
 #: view:base.language.export:0
@@ -2188,6 +2396,35 @@ msgid ""
 "Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"Das Verkaufsbericht-Modul ermöglicht Ihnen Ihre Verkäufe und Auslieferungen "
+"(Kommissionen) in verschiedenen\n"
+"Berichten zu Kategorisieren.\n"
+"============================================================================="
+"=================\n"
+"\n"
+"Dieses Modul ist für größere, in Abteilungen gegliederte Unternehmen sehr "
+"nützlich.\n"
+"\n"
+"Sie können Berichte für verschiedene Zwecke einrichten, einige Beispiele:\n"
+"    * Verkäufe unterschiedlicher Abteilungen trennen\n"
+"    * Berichte über Lieferung per LKW oder UPS\n"
+"\n"
+"Berichte haben einen Verantwortlichen und entwickeln sich in Stadien:\n"
+"    * Entwurf, Offen, Storniert, Abgeschlossen.\n"
+"\n"
+"Stapelverabeitung kann auf die verschiednen Berichte angewendet werden um\n"
+"alle Verkäufe auf einmal zu bestätigen, zu prüfen oder Verpackung in "
+"Rechnung zu stellen...\n"
+"\n"
+"Es unterstützt auch Methoden der Massen-Rechnungstellung die auf Partnern "
+"und \n"
+"Aufträgen eingestellt werden können, Beispielsweise:\n"
+"    * tägliche Rechnungsstellung,\n"
+"    * monatliche Rechnungsstellung, ...\n"
+"\n"
+"Einige Statistikberichte sind enthalten.\n"
+"    "
 
 #. module: base
 #: field:res.company,logo:0
@@ -2223,6 +2460,22 @@ msgid ""
 "re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul dient der Spesenverwaltung der Mitarbeiter.\n"
+"=================================================\n"
+"\n"
+"Der gesamte Geschäftsprozess ist eingebaut:\n"
+"    * Spesen-Eingabeentwurf\n"
+"    * Bestätigung durch den Mitarbeiter\n"
+"    * Prüfung durch den Vorgesetzten\n"
+"    * Prüfung der Buchhaltung und Rechnungsstellung (Zahlschein)\n"
+"    * Auszahlung der Ansprüche an den Mitarbeiter\n"
+"\n"
+"Dieses Modul nutzt auch das Kostenstellen-Modul und ist mit dem\n"
+"Modul \"Rechnung gemäß Stundennachweis\" kompatibel, so dass Sie \n"
+"bei Projektbezogener Abrechnung diese Kosten automatisch \n"
+"weiterverrechnen können.\n"
+"    "
 
 #. module: base
 #: field:ir.values,action_id:0
@@ -2349,6 +2602,18 @@ msgid ""
 "system to store and search in your CV base.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul verwaltet Stellenausschreibungen und den Einstellungsprozess.\n"
+"================================================================\n"
+"\n"
+"Es ist eingebunden in das Umfrage-Modul (survey) um die Befragung für\n"
+"verschieden Stellen zu defnieren.\n"
+"\n"
+"Dieses Modul nutzt das EMail-Modul um automatisch Nachrichten zu erkennen,\n"
+"die an die Adresse jobs@UNTERNEHMEN.COM gerichtet sind. Ebenfalls wird\n"
+"das Dokementen Verwatungs System (DMS) unterstützt, um dort Lebensläufe \n"
+"bzw. Bewerbungen ablegen und recherchieren zu können.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
@@ -2426,6 +2691,20 @@ msgid ""
 "and categorize your interventions with a channel and a priority level.\n"
 "    "
 msgstr ""
+"\n"
+"Helpdesk-Verwaltung.\n"
+"===================\n"
+"\n"
+"Wie Karteikarten/Datensätze und Forderungsverwaltung, so sind auch der "
+"Helpdesk\n"
+"und techn. Betreuung wichtige und gute Hilfmittel Ihre Maßnahmen "
+"festzuhalten.\n"
+"Diese Erweiterung ist eher auf die (fern-) mündliche Hilfestellung "
+"ausgerichtet, was\n"
+"nicht notwendigerweise an eine Forderung geknüpft ist. Wählen Sie den Kunden "
+"aus,\n"
+"fügen Notizen hinzu und kategorisieren Sie die Ausrichtung und Priorität.\n"
+"    "
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2446,6 +2725,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Modul für die Verwaltung von Resourcen.\n"
+"===================================\n"
+"\n"
+"Eine Resource wird durch etwas planbares repräsentiert (ein\n"
+"zugeteilter Entwickler oder ein Leitstand für Fertigungsaufträge).\n"
+"Dieses Modul verwaltet einen Terminkalender dem jede Resource \n"
+"zugewiesen wird. Der Kalender verwaltet auch die Abwesenheiten \n"
+"(Zeiten der nicht-verfügbarkeit) jeder Resource.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.rule:0
@@ -2486,6 +2776,12 @@ msgid ""
 "\n"
 "Configure servers and trigger synchronization with its database objects.\n"
 msgstr ""
+"\n"
+"Synchronisation mit allen Objekten.\n"
+"===============================\n"
+"\n"
+"Einstellen der Server und Abgleich der Auslöser (Trigger) mit ihren "
+"Datenbank-Objekten\n"
 
 #. module: base
 #: model:res.country,name:base.mg
@@ -2539,6 +2835,12 @@ msgid ""
 "orders.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Kostenverrechnung zu Aufträgen.\n"
+"=====================================================\n"
+"\n"
+"Mit diesem Modul können Sie Kostenstellen an Aufträge binden.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.url,target:0
@@ -2626,6 +2928,8 @@ msgstr "Server Aktion"
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
 msgstr ""
+"Argumente die zusammen mit der Sicht-Kennung an die Anwendung (client) "
+"gesendet werden"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_gtd
@@ -2656,6 +2960,33 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul führt das Konzept der \"Dinge erledigt kriegen\" -Methodik.\n"
+"(Getting Things Done = GTD)\n"
+"============================================================\n"
+"\n"
+"Dieses Modul implementiert eine einfache auf Aufgaben basierende \"Zu "
+"Erledigen\"-Liste. \n"
+"Es fügt dem Projekt-Modul ein veränderliche Aufgabenliste mit dem Minimum an "
+"\n"
+"erforderlichen Feldern hinzu.\n"
+"\n"
+"Die Aufgabenliste ist an die GTD (Getting Things Done) -Methodik angelehnt.\n"
+"Diese weltweit genutzte Methodik wirdzur Verbesserung der persönlichen \n"
+"Zeitverwaltung benutzt.\n"
+"\n"
+"Getting Things Done (oft auch GTD abgekürzt) ist eine Methode zur \n"
+"Handlungs-Verwaltung, durch David Allen entworfen und im gleichnamigen\n"
+"Buch beschrieben.\n"
+"\n"
+"GTD beruht auf dem Prinzip, dass eine Person Aufgaben aus dem Gedächtnis "
+"entfernt \n"
+"werden müssen indem sie ausserhalb aufgezeichnet werden.Auf diesem Wege "
+"wird\n"
+"das Gedächtnis von der Aufgabe befreit sich an alles zu erledigende zu "
+"erinnern und \n"
+"sich auf die tatsächliche Durchführung konzentrieren kann.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.tt
@@ -2731,7 +3062,7 @@ msgstr "Vererbt"
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "Serialisierungs-Feld"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -2827,6 +3158,10 @@ msgid ""
 "==================================================\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul fügt jeder Kanban-Sicht des Projekts einen PAD hinzu\n"
+"=========================================================\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -2904,6 +3239,14 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Einstellung der Genauigkeit für Preise in verschiedenen Anwendungen: "
+"Finanzen, Verkauf, Beschaffung, usw.\n"
+"============================================================================="
+"============\n"
+"\n"
+"Die Anzahl der Nachkommastellen (Auflösung) wird je Unternehmen "
+"eingestellt.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pl
@@ -2925,7 +3268,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params_store:0
 msgid "Params storage"
-msgstr ""
+msgstr "Ablage für Parameter"
 
 #. module: base
 #: code:addons/base/module/module.py:409
@@ -2956,12 +3299,27 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Segmentierung der Partner.\n"
+"===============================================\n"
+"\n"
+"Es nutzt die Profil-Kriterien des ursprünglichen Segmentierungs-Moduls und "
+"erweitert diese. Dank des neuen Fragebogen-Konzepts können Sie nun Fragen zu "
+"einem Fragebogen umgruppieren und diesen unmittelbar auf Partner anwenden.\n"
+"\n"
+"Ebenfalls wurden die früheren Kunden- bzw- Lieferantenverwaltungen "
+"zusammengeführt, da diese sich überschnitten haben.\n"
+"\n"
+"    * BEMERKUNG: Dieses Modul ist nicht mit dem Modul \"Segmentierung\" "
+"verwendbar, da es \n"
+"       der umbenannte Nachfolger ist.\n"
+"    "
 
 #. module: base
 #: code:addons/report_sxw.py:434
 #, python-format
 msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Unbekannte Berichtsart: %s"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:282
@@ -3081,7 +3439,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
 msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "Wiki: Qualitätshandbuch"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3168,7 +3526,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_survey_user
 msgid "Survey / User"
-msgstr ""
+msgstr "Überwachung / Benutzer"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3212,6 +3570,13 @@ msgid ""
 "for Wiki FAQ.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul stellt eine Wiki FAQ - Vorlage bereit.\n"
+"==========================================\n"
+"\n"
+"Es hat Demo-Daten, womit zugleich eine Wiki Gruppe und eine Wiki-Seite \n"
+"für eine Wiki FAQ erstellt wird.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3384,6 +3749,43 @@ msgid ""
 "    * Graph of Sales by Product's Category in last 90 days\n"
 "    "
 msgstr ""
+"\n"
+"Das Haupt-Modul zur Verwaltung von Angeboten und Aufträgen.\n"
+"=====================================================\n"
+"\n"
+"Arbeitsabläufe mit Prüfschritten:\n"
+"---------------------------------------\n"
+"    * Angebotsanfrage -> Verkaufsauftrag -> Rechnung\n"
+"\n"
+"Methoden der Rechnungsstellung:\n"
+"-----------------------------------------\n"
+"    * Rechnung bei Auftrag (vor oder nach Auslieferung)\n"
+"    * Rechnung bei Lieferung\n"
+"    * Rechnung gemäß Stundennachweis\n"
+"    * Rechnung vorab\n"
+"\n"
+"Partner Voreinstellungen:\n"
+"    * Versandart\n"
+"    * Rechnungsstellung\n"
+"    * Handelabwicklung\n"
+"\n"
+"Produktbestände und -preise\n"
+"----------------------------------\n"
+"\n"
+"Liefermethoden:\n"
+"---------------------\n"
+"    * Alles gemeinsam\n"
+"    * Mehrfachsendung\n"
+"    * geringste Lieferkosten\n"
+"\n"
+"Pinnwand für Verkaufsleitung einschließlich:\n"
+"---------------------------------------------------\n"
+"    * Angebotsübersicht\n"
+"    * Monatliche Verkäufe\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Verkäufer\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Kunde\n"
+"    * Diagramm: Verkäufe der letzten 90 Tage je Produktkategorie\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3463,6 +3865,20 @@ msgid ""
 "module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul definiert 'Portale' um den Zugriff auf Ihre OpenERP-Datenbank \n"
+"durch externe Benutzer zu reglementieren.\n"
+"===================================================================\n"
+"\n"
+"Ein Portal stellt einstallbare Menüs und Zugriffsrechte für eine (dem Portal "
+"\n"
+"zugewiesene) Benutzergruppe. Es stellt auch Beziehungen von Anwendergruppen\n"
+"zu Portalbenutzern her (eine Gruppe dem Portal hinzufügen verknüpft die "
+"Gruppe \n"
+"automatisch mit den Portalbenutzern usw.). Dies ist sehr nützlich in "
+"Verbindung mit \n"
+"dem dem Freigaben-Modul.\n"
+"    "
 
 #. module: base
 #: selection:res.request,priority:0
@@ -3552,7 +3968,7 @@ msgstr "Mayotte"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Aufgaben der Kundenverwaltung"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
@@ -3573,6 +3989,16 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Modul das Begleichen von Eingangsrechnungen zu verwalten.\n"
+"===================================================\n"
+"\n"
+"Dieses Modul liefert:\n"
+"-------------------------\n"
+"    * einen effizienteren Weg den Rechnungsausgleich zu verwalten,\n"
+"    * einen Grundmechanismus einfach verschiedene \n"
+"       Zahlungsautomatismen einzusetzen.\n"
+"    "
 
 #. module: base
 #: view:ir.rule:0
@@ -3599,11 +4025,33 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul bietet einige Möglichkeiten das Erscheinungsbild von Rechnungen "
+"zu verbessern.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Es bietet die folgenden Möglichkeiten:\n"
+"---------------------------------------------\n"
+"    * Positionen einer Rechnung sortieren,\n"
+"    * Überschriften, Kommentare, Zwischensummen hinzufügen\n"
+"    * Waagerechte Trennlinie\n"
+"    * Seitenumbruch erzwingen\n"
+"\n"
+"Darüber hinaus gibt es die Möglichkeit alle ausgewählten Rechnungen mit "
+"einer \n"
+"besonderen Nachricht am Ende zu versehen. Dies kann für Wünsche zum "
+"Jahresende \n"
+"ebenso genutzt werden wie für Terminhinweise oder ähnliches.\n"
+"\n"
+"    "
 
 #. module: base
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Fehler! Sie können keine rekursive assoziierte Mitglieder anlegen."
+msgstr ""
+"Fehler! Sie können keine rekursiv assoziierten (sich selbst einschließende) "
+"Mitglieder anlegen."
 
 #. module: base
 #: view:res.payterm:0
@@ -3654,6 +4102,9 @@ msgid ""
 "        OpenERP Web chat module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Chat-Modul\n"
+"        "
 
 #. module: base
 #: field:res.partner.address,title:0
@@ -3676,7 +4127,7 @@ msgstr "Rekursive Einträge entdeckt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit_sample
 msgid "Webkit Report Samples"
-msgstr ""
+msgstr "Webkit Berichtsbeispiele"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
@@ -3768,6 +4219,8 @@ msgstr "RML  (nunmehr ungültig - verwende Report)"
 #: sql_constraint:ir.translation:0
 msgid "Language code of translation item must be among known languages"
 msgstr ""
+"Sprachenschlüssel des zu übersetzenden Ausdrucks muss aus einer der "
+"bekannten Sprachen gewählt werden."
 
 #. module: base
 #: view:ir.rule:0
@@ -3791,6 +4244,14 @@ msgid ""
 "templates to target objects.\n"
 "    "
 msgstr ""
+"\n"
+"    * Unterstützung der Mehrsprachigkeit für Kontenpläne, Steuern, "
+"Steuerschlüssel, Journale, FiBu-Vorlagen,\n"
+"        Kostenstellen und Betriebsabrechnungs-Berichte.\n"
+"    * Änderungen durch den Assistenten:\n"
+"        - Übersetzungen für Kontenplan, Steuern, Steuerschlüssel und Bilanz "
+"von Vorlagen in die Zielobjekte kopieren.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -3835,6 +4296,9 @@ msgid ""
 "        OpenERP Web mobile.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web - Mobil\n"
+"        "
 
 #. module: base
 #: view:res.lang:0
@@ -3993,6 +4457,16 @@ msgid ""
 "user rights to Demo user.\n"
 "    "
 msgstr ""
+"\n"
+"Zugriffsrechte zur Finanzierung.\n"
+"===========================\n"
+"\n"
+"Diese Modul gibt dem Administrator Zugriff auf sämtliche Finanz-Bereiche\n"
+"wie Berichte / Listen und den Kontenplan.\n"
+"\n"
+"Es weist dem Administrator Manager- und Benutzer-Zugriffsrechte zu,\n"
+"einem Benutzer namens Demo nur die Benutzer-Zugriffsrechte.\n"
+"    "
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -4018,12 +4492,12 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,description:base.module_web_rpc
 msgid "Openerp web web"
-msgstr ""
+msgstr "OpenERP web web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr ""
+msgstr "Stundennachweis für Anliegen"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -4125,7 +4599,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Italienische Buchführung"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -4169,6 +4643,16 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul gibt Ihnen Überblick über Kunden-/Lierantenforderungen und über "
+"Mißstande.\n"
+"============================================================================="
+"\n"
+"\n"
+"Es ist vollständig mit dem EMail-Modul verwendbar, so dass Sie automatisch "
+"auf eingehende \n"
+"Nachrichten hin neue Forderungen erstellen können.\n"
+"    "
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -4293,7 +4777,7 @@ msgstr "SXW Inhalt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polen - Buchführung"
 
 #. module: base
 #: view:ir.cron:0
@@ -4323,6 +4807,19 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Das Beschaffungs-Modul dient der Erstellung von Beschaffungsaufträgen \n"
+"für den Wareneinkauf beim Lieferanten.\n"
+"===============================================================\n"
+"\n"
+"Eine Lieferrechnung wird für die jeweilige Bestellung erstellt.\n"
+"\n"
+"Ein Pinnwand für die Beschaffungsverwaltung schließt ein:\n"
+"    * Aktuelle Bestellungen\n"
+"    * Bestellungen im Entwurf\n"
+"    * Diagramm über monatliche Mengen udn Beträge\n"
+"\n"
+"    "
 
 #. module: base
 #: view:ir.model.fields:0
@@ -4367,6 +4864,9 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"Wenn kein spezifischer Mailserver für die Mail ausgewählt ist wird der "
+"Server mit der höchsten Priorität genutzt. Standardmässige Priorität ist 10 "
+"(kleinere Nummer = höhere Priorität)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4423,7 +4923,7 @@ msgstr "`code` muss eindeutig sein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr ""
+msgstr "Spesen-Verwaltung"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4444,7 +4944,7 @@ msgstr "Surinam"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Berechne geleistete Arbeitszeit"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4461,7 +4961,7 @@ msgstr "Bankkonto"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gr
 msgid "Greece - Accounting"
-msgstr ""
+msgstr "Griechische Buchführung"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4481,7 +4981,7 @@ msgstr "Individualanpassung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "web Gantt"
-msgstr ""
+msgstr "Gantt-Diagramm im OpenERP web"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -4491,7 +4991,7 @@ msgstr "Lizenz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "web Graph"
-msgstr ""
+msgstr "Graph im OpenERP web"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -4538,6 +5038,20 @@ msgid ""
 "above. Specify the interval information and partner to be invoice.\n"
 "    "
 msgstr ""
+"\n"
+"Erzeuge wiederkehrende Dokumente.\n"
+"================================\n"
+"\n"
+"Dieses Modul die Erstellung neuer Dokumente und jeweiliger Abonnements "
+"hierzu.\n"
+"\n"
+"Um z. B. eine Rechnung automatisch, periodisch zu erstellen:\n"
+"    * Legen Sie den Dokument-Typ auf \"Rechnungsobjekt\" fest\n"
+"    * Erstellen Sie ein Abonnement mit dem oben festgelegten Dokument "
+"(Quelle). \n"
+"    * Legen Sie nun das Intervall fest und den Partner als "
+"Dokumentempfänger.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -4585,7 +5099,7 @@ msgstr "Modul Import"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Schweizer Buchführung"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -4735,7 +5249,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
 msgid "Specific Industry Applications"
-msgstr ""
+msgstr "Spezielle industrielle Anwendungen"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_retailers0
@@ -4760,7 +5274,7 @@ msgstr "Umsatzsteuer Nummer Überprüfung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Geo-Ortung für Partner"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -4837,6 +5351,33 @@ msgid ""
 "Also implements IETF RFC 5785 for services discovery on a http server,\n"
 "which needs explicit configuration in openerp-server.conf, too.\n"
 msgstr ""
+"\n"
+"Mit diesem Modul wird der WebDAV-Server für Dokumente aktiviert.\n"
+"=========================================================\n"
+"\n"
+"Sie können dann jeden kompatiblen Browser verwenden, um Anhänge aus "
+"OpenObjects einzusehen.\n"
+"\n"
+"Nach der Installation wird der WebDAV-Server durch einen [webdav]-Abschnitt "
+"in der \n"
+"Konfigurationsdatei des OpenERP-Servers kontrolliert. Die Konfigurations-"
+"Parameter sind\n"
+"die folgenden:\n"
+"    [webdav]\n"
+"    ;enable = True   ;webdav mittels http(s)-Server bedienen\n"
+"    ;vdir = webdav    ; das Verzeichnis, das angeboten wird\n"
+"    ;   diese Vorgabe gibt an, dass WebDAV auf "
+"http://server.com:8069/webdav/ erscheint\n"
+"    ;verbose = True  ; ausführliche Meldungen für webdav\n"
+"    ;debug = True     ; Meldungen für Fehlerbeseitigung zusätzlich ausgeben\n"
+"    ;   da diese Ausgaben an die Python-Protokollierung mit den "
+"Einstellungen 'debug' und \n"
+"    ;   'debug_rpc'weitergeleitet werden können sie beide eingeschaltet "
+"lassen\n"
+"\n"
+"Die Dienst-Erkennung aud http-Servern nach IETF RFC 5785 ist auch "
+"eingebaut,\n"
+"diese Bedarf in der openerp-server.conf zusätzlich explizite Einstellungen.\n"
 
 #. module: base
 #: model:res.country,name:base.sm
@@ -4955,7 +5496,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_chat
 msgid "Web Chat"
-msgstr ""
+msgstr "Webchat"
 
 #. module: base
 #: field:res.company,rml_footer2:0
@@ -5326,7 +5867,7 @@ msgstr "Feld"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "Langzeitprojekte"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -5712,6 +6253,47 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Erstellung mehrerer Kostenpläne und "
+"Zusammenfassung mittels Hauptplan.\n"
+"============================================================================="
+"===========\n"
+"\n"
+"Es werden hier mehrere Kostenstellen berührt, wenn eine Rechnung oder deren "
+"Positionen bestätigt werden.\n"
+"\n"
+"Zum Beispiel können Sie die folgende Kosten-Struktur  festlegen:\n"
+"  Projekte\n"
+"      Projekt 1\n"
+"          Unterproj. 1.1\n"
+"          Unterproj. 1.2\n"
+"\n"
+"      Projekt 2\n"
+"  Verkäufer\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Wir haben also zwei Haupt-Pläne. Projekte und Verkäufer. Eine "
+"Rechnungsposition soll\n"
+"nun in der Lage sein in die Kostenstellen Unterproj 1.1 und Fabien der zwei "
+"Pläne zu \n"
+"buchen. Der Betrag kann aber auch gesplittet werden. In folgendem Beispiel "
+"würde \n"
+"die Rechnung auf beide Unterprojekte aber nur einem Verkäufer gebucht "
+"werden:\n"
+"\n"
+"Plan 1:\n"
+"    Unterproj 1.1: 50%\n"
+"    Unterproj 1.2: 50%\n"
+"Plan 2:\n"
+"    Eric: 100%\n"
+"\n"
+"Wenn diese Position der Rechnung also bestätigt wird, werden drei "
+"Kostenstellen \n"
+"für eine Kostenposition bebucht. Bei der einrichtung des Plans werden "
+"Minimal-\n"
+"und Maximalanteile der Verteilung überprüft.\n"
+"        "
 
 #. module: base
 #: help:res.country.state,code:0
@@ -5767,6 +6349,17 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Mit diesem Modul können Kostenstellen-Sichten angepasst werden um "
+"Projektverwaltern von\n"
+"Dienstleister-Unternehmen relevante Daten anzuzeigen.\n"
+"============================================================================="
+"==\n"
+"\n"
+"Es fügt ein Menü hinzu, mit dem für jeden Manager jeweils relevante "
+"Information angezeigt wird.\n"
+"Ebenso können die Kostenstellensummen nach Benutzern oder nach Monaten "
+"berichtet werden.\n"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -5925,7 +6518,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Belgien - Lohn und Gehalt"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -6053,11 +6646,19 @@ msgid ""
 "The user can also publish notes.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglich dem Benutzer individuelle Pinnwände zu erstellen.\n"
+"=============================================================\n"
+"\n"
+"Dieses Modul erstellt auch die Administrations-Pinnwand.\n"
+"\n"
+"Der Anwender kann auch Notizen veröffentlichen.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_scrum
 msgid "Methodology: SCRUM"
-msgstr ""
+msgstr "SCRUM Methodik"
 
 #. module: base
 #: view:ir.attachment:0
@@ -6205,6 +6806,8 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"- Aktion: Eine Aktion, die für ein vorgegebenes Modell definiert wird.\n"
+"- Standard: ein Vorgabewert für ein Feld"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_addess_tree
@@ -6236,7 +6839,7 @@ msgstr "vsep"
 #. module: base
 #: model:res.widget,title:base.openerp_favorites_twitter_widget
 msgid "OpenERP Tweets"
-msgstr ""
+msgstr "OpenERP Tweets"
 
 #. module: base
 #: code:addons/base/module/module.py:392
@@ -6398,7 +7001,7 @@ msgstr "Inhalt"
 #: field:ir.module.module,menus_by_module:0
 #: view:res.groups:0
 msgid "Menus"
-msgstr "Menü"
+msgstr "Menüs"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -6423,7 +7026,7 @@ msgstr "Israel"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA Buchführung"
 
 #. module: base
 #: help:res.bank,bic:0
@@ -6589,12 +7192,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
 msgid "Customer Profiling"
-msgstr ""
+msgstr "Kundenprofil"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Problemverfolgung"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6938,7 +7541,7 @@ msgstr "Der Name des Moduls muss eindeutig sein!"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_contact
 msgid "Contacts Management"
-msgstr ""
+msgstr "Verwaltung von Kontakten"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -7064,7 +7667,7 @@ msgstr "Hinzufügen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador Buchführung"
 
 #. module: base
 #: field:res.partner.category,name:0
@@ -7095,6 +7698,16 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"Modul für Personalverwaltung.\n"
+"=============================\n"
+"\n"
+"Sie verwalten:\n"
+"    * Mitarbeiter und Hierarchien. Sie legen den Mitarbeiter mit Nutzungs- "
+"und Anzeigehierarchien fest.\n"
+"    * Personalabteilungen\n"
+"    * Personalverwaltung: Positionen\n"
+"    "
 
 #. module: base
 #: view:res.widget.wizard:0
@@ -7104,7 +7717,7 @@ msgstr "Assistent Widgets"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras Buchführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7171,7 +7784,7 @@ msgstr "Aktiv"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ma
 msgid "Maroc - Accounting"
-msgstr ""
+msgstr "Marokko Buchführung"
 
 #. module: base
 #: model:res.country,name:base.mn
@@ -7226,6 +7839,22 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul fügt eine Abkürzung zu einer oder mehreren "
+"Geschäftsgelegenheiten im Kundenmanagement hinzu.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"Diese Abkürzung ermöglicht die Generierung eines Verkaufsauftrags auf Basis "
+"des ausgewählten Falles.\n"
+"Sind verschiedene Fälle geöffnet (Liste), wird fallweise je ein "
+"Verkaufsauftrag generiert und der Fall dann,\n"
+"mit Bezug auf den generierten Auftrag, geschlossen.\n"
+"\n"
+"Wir empfehlen den Einsatz dieses Moduls, wenn Sie sowohl das Modul Verkauf "
+"wie auch die \n"
+"Kundenverwaltung installiert haben.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -7343,6 +7972,17 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"\n"
+"Ermöglicht Ihnen das Ergänzen von Lieferarten in Verkaufsaufträgen und bei "
+"der Kommissionierung.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"Sie können Ihre eigene Spedition und das Raster der Preise festlegen.\n"
+"Beim erzeugen von Rechnungen aus Kommissionierung, kann OpenERP den\n"
+"den Versandweg ermitteln und die Kosten der Rechnung hinzufügen.\n"
+"\n"
+"     "
 
 #. module: base
 #: view:workflow.workitem:0
@@ -7798,6 +8438,10 @@ msgid ""
 "    Module for the Check writing and check printing  \n"
 "    "
 msgstr ""
+"\n"
+"    Modul für das Ausfüllen und Drucken von Schecks.\n"
+"    ===========================================  \n"
+"    "
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
@@ -8078,7 +8722,7 @@ msgstr "ir.server.object.lines"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Belgische Buchführung"
 
 #. module: base
 #: code:addons/base/module/module.py:622
@@ -8324,12 +8968,12 @@ msgstr "XSL Pfad"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_invoice_layout
 msgid "Invoice Layouts"
-msgstr ""
+msgstr "Rechnungsdruck mit Erweiterungen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Erweiterte Lieferketten"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
@@ -8414,7 +9058,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "eRechnung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_association
@@ -8427,6 +9071,13 @@ msgid ""
 "memberships, membership products (schemes), etc.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul richtet Module ein, die sich auf Gesellschaften beziehen.\n"
+"============================================================\n"
+"\n"
+"Es installiert Profile um Veranstaltungen, Registrierung, Mitgliedschaften, "
+"Mitgliederprodukte (Schemen), usw. von Gesellschaften zu verwalten.\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:2693
@@ -8477,6 +9128,14 @@ msgid ""
 "German accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Deutscher Kontenrahmen und Übersetzung.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
@@ -8508,6 +9167,30 @@ msgid ""
 "depending on the product's configuration.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul dient der Berechnung von Beschaffungsaufträgen.\n"
+"======================================================\n"
+"\n"
+"Im Prozess der Materialbedarfsplanung, werden Beschaffungsaufträge erstellt. "
+"Diese\n"
+"stossen Fertigungsaufträge, Bestellanfragen/-aufträge, Lagerentnahmen an. \n"
+"Beschaffungsaufträge werden automatisch durch das System generiert und der\n"
+"Nutzer wird darüber nicht weiter informiert, es seie denn ein Problem tritt "
+"dabei auf.\n"
+"In diesem Fall wird das System über den Ausnahmezustand informieren, so dass "
+"das \n"
+"hindernde Problem manuell behoben werden kann (so kann z. B. eine Stückliste "
+"nicht \n"
+"definiert worden sein oder die Angabe eine Lieferanten fehlt).\n"
+"\n"
+"Der Beschaffungsauftrag legt einen Terminvorschlag für die automatische "
+"Beschaffung\n"
+"des nachzubestellenden Produktes an. Dieser Beschaffungsauftrag leitet eine "
+"Aufgabe \n"
+"ein, entweder ein Einkaufsauftrag beim Lieferanten oder auch einen "
+"Fertigungsauftrag,\n"
+"abhängig von der Produktzusammensetzung.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.mx
@@ -8770,7 +9453,7 @@ msgstr "Iteration"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_planning
 msgid "Resources Planing"
-msgstr ""
+msgstr "Ressourcenplanung"
 
 #. module: base
 #: field:ir.module.module,complexity:0
@@ -8872,12 +9555,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_repair
 msgid "Repairs Management"
-msgstr ""
+msgstr "Verwaltung von Reparaturen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_asset
 msgid "Assets Management"
-msgstr ""
+msgstr "Anlagenverwaltung"
 
 #. module: base
 #: view:ir.model.access:0
@@ -9148,7 +9831,7 @@ msgstr "Nördliche Marianen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_claim_from_delivery
 msgid "Claim on Deliveries"
-msgstr ""
+msgstr "Forderungen aus Lieferung"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -9199,6 +9882,17 @@ msgid ""
 "    * Generates Relationship Graph\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul generiert technische Leitfäden der ausgewählten Module im "
+"Restruktured Text -Format (RST).\n"
+"============================================================================="
+"=============\n"
+"\n"
+"    * Es verwendet Sphinx (http://sphinx.pocoo.org) Implementierung von RST\n"
+"    * Es erzeugt ein tar-Archiv (.tgz Dateiendung) welches eine Dateiliste "
+"und eine Datei pro Modul\n"
+"    * Erzeugt einen Beziehungsgraphen\n"
+"    "
 
 #. module: base
 #: field:res.log,create_date:0
@@ -9214,7 +9908,7 @@ msgstr "Übersetzungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "ToDo-Listen"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -9447,7 +10141,7 @@ msgstr "Allgemeine Einstellungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uy
 msgid "Uruguay - Chart of Accounts"
-msgstr ""
+msgstr "Urugay - Kontenführung"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
@@ -9467,7 +10161,7 @@ msgstr "Algerien"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin
 msgid "CRM Plugins"
-msgstr ""
+msgstr "Plugins für die Kundenverwaltung"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
@@ -9565,11 +10259,15 @@ msgid ""
 "=====================================================\n"
 "\n"
 msgstr ""
+"\n"
+"Eine gemeinsame Schnittstelle für Plugins.\n"
+"======================================\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Just in Time Terminierung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
@@ -9601,7 +10299,7 @@ msgstr "osv_memory.autovacuum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_us
 msgid "United States - Chart of accounts"
-msgstr ""
+msgstr "USA - Kontenführung"
 
 #. module: base
 #: view:base.language.install:0
@@ -9657,7 +10355,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_margin
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Margen in Kundenaufträgen"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -9668,7 +10366,7 @@ msgstr "Komponenten Lieferant"
 #: model:ir.module.category,name:base.module_category_purchase_management
 #: model:ir.module.module,shortdesc:base.module_purchase
 msgid "Purchase Management"
-msgstr ""
+msgstr "Beschaffung"
 
 #. module: base
 #: field:ir.module.module,published_version:0
@@ -9792,6 +10490,9 @@ msgid ""
 "        OpenERP Web example module.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Web Beispiel-Modul\n"
+"        "
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -9966,6 +10667,10 @@ msgid ""
 "Todo list for CRM leads and opportunities.\n"
 "    "
 msgstr ""
+"\n"
+"Liste zu erledigender Aufgaben für Leads und Gelegenheiten der "
+"Kundenverwaltung.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -10121,7 +10826,7 @@ msgstr "Berichtsvorschau"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "Beschaffungsplanung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic_journal_billing_rate
@@ -10303,7 +11008,7 @@ msgstr "ID des Zieldatensatzes in der DB"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
 msgid "Contracts Management"
-msgstr ""
+msgstr "Vertragsverwaltung"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10359,6 +11064,23 @@ msgid ""
 "account numbers\n"
 "    "
 msgstr ""
+"\n"
+"Das Modul erweitert das Standard-Objekt account_bank_statement_line "
+"(Auszugszeile) für verbessertes eBanking.\n"
+"============================================================================="
+"================\n"
+"\n"
+"Ergänzt:\n"
+"- Wertstellungsdatum (Valuta)\n"
+"- Mehrfachanweisungen\n"
+"- Nachverfolgung von Änderungen zu Auszugszeilen\n"
+"- Bank-Auszugszeilen Sicht\n"
+"- Bericht der Kontostände per Bank-Auszug\n"
+"- Leistungsteigerung für digitalen Import der Kontoauszüge (via "
+"\"ebanking_import\" Kontext-Kennung) \n"
+"- Namenssuche in res.partner.bank verbessert, um Suche nach Bankkonto oder "
+"IBAN zu ermöglichen\n"
+"    "
 
 #. module: base
 #: code:addons/orm.py:1895
@@ -10436,6 +11158,14 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"Erlaubt die Annullierung von Buchungen.\n"
+"====================================\n"
+"\n"
+"Dieses Modul fügt ein Feld  \"Erlaube Löschung von Buchungen\" in der Sicht "
+"Kontenbuch hinzu. Wenn auf Wahr gesetzt läßt dies die Löschung von Buchungen "
+"und Rechnungen zu.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -10641,6 +11371,12 @@ msgid ""
 "\n"
 "Using this you can directly open Google Map from the URL widget."
 msgstr ""
+"\n"
+"Das Modul fügt ein Google-Map Feld in die Partneraddresse-Sicht ein.\n"
+"===========================================================\n"
+"\n"
+"Mit der hier eingerichteten URL-Verknüpfung können Sie unmittelbar eine "
+"Google-Map öffnen."
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -10805,6 +11541,12 @@ msgid ""
 "the bounds of global ones. The first group rules restrict further than "
 "global rules, but any additional group rule will add more permissions"
 msgstr ""
+"Globale -nicht gruppenspezifische- Regeln sind  Einschränkungen, die nicht "
+"umgangen werden können.\r\n"
+"Lokale Gruppenrechte erweitern die Berechtigungen innerhalb der Globalen "
+"Regeln.\r\n"
+"Die erste Gruppe beschränkt die globalen Rechte, alle zusätzlichen erweitern "
+"die gruppenlokalen Rechte."
 
 #. module: base
 #: field:res.currency.rate,rate:0
@@ -11024,7 +11766,7 @@ msgstr "Oder"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr ""
+msgstr "Brasilianische Buchführung"
 
 #. module: base
 #: model:res.country,name:base.pk
@@ -11162,7 +11904,7 @@ msgstr "Aktionen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_project
 msgid "Retro-Planning on Events"
-msgstr ""
+msgstr "Retrograde Planung von Veranstaltungen"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -11632,7 +12374,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr ""
+msgstr "Angestelltenverzeichnis"
 
 #. module: base
 #: view:ir.cron:0
@@ -11882,7 +12624,7 @@ msgstr "Kopiere Objekt"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Emails Management"
-msgstr ""
+msgstr "Verwaltung von Emails"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
@@ -12060,7 +12802,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk
 msgid "UK - Accounting"
-msgstr ""
+msgstr "Großbritannien Buchführung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_scrum
@@ -12133,7 +12875,7 @@ msgstr "Konfiguration"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "India - Accounting"
-msgstr ""
+msgstr "Indische Buchführung"
 
 #. module: base
 #: field:ir.actions.server,expression:0
@@ -12148,7 +12890,7 @@ msgstr "Anfangsdatum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gt
 msgid "Guatemala - Accounting"
-msgstr ""
+msgstr "Guatemala Buchführung"
 
 #. module: base
 #: help:ir.cron,args:0
@@ -12530,7 +13272,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
 msgid "Authentication via LDAP"
-msgstr ""
+msgstr "Authentifizierung mit LDAP"
 
 #. module: base
 #: view:workflow.activity:0
@@ -12665,12 +13407,12 @@ msgstr "Pinnwände"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "Beschaffungsvorgänge"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Lohnbuchhaltung"
 
 #. module: base
 #: help:ir.attachment,type:0
@@ -13046,6 +13788,8 @@ msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
 "explicitly."
 msgstr ""
+"Bitte tragen sie mindestens einen SMTP-Server ein, oder geben sie die SMTP "
+"Parameter explizit an"
 
 #. module: base
 #: view:ir.attachment:0
@@ -13127,7 +13871,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_th
 msgid "Thailand - Accounting"
-msgstr ""
+msgstr "Thailändische Buchführung"
 
 #. module: base
 #: view:res.lang:0
@@ -13372,6 +14116,21 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"\n"
+"Schweizer Übersetzung :\n"
+"- DTA-Generierung für viele Zahlungstypen\n"
+"- ESR-Verwaltung (Nummerngenerierung, Berichte, etc..)\n"
+"- Zahlungsbewegungen von der Bankdatei importieren (wie v11 etc..)\n"
+"- Vereinfachen für das Abstimmen von Konten\n"
+"\n"
+"Sie können PLZ- und Bank-AutoVervollständigung hinzufügen mit:\n"
+"- l10n_ch_zip\n"
+"- l10n_ch_bank\n"
+"\n"
+"Author: Camptocamp SA\n"
+"Donatoren: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+"\n"
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -13773,7 +14532,7 @@ msgstr "Diagramm"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
 msgid "Spanish - Accounting (PGCE 2008)"
-msgstr ""
+msgstr "Spanische Buchführung (PGCE 2008)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
@@ -13870,7 +14629,7 @@ msgstr "Export"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl
 msgid "Netherlands - Accounting"
-msgstr ""
+msgstr "Holländische Buchführung"
 
 #. module: base
 #: field:res.bank,bic:0
@@ -14158,7 +14917,7 @@ msgstr "_Export"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Followup Management"
-msgstr ""
+msgstr "Offene Posten Verwaltung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -14328,7 +15087,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "Benutzern erlauben sich mit OpenID zu authentifizieren"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -14441,7 +15200,7 @@ msgstr "Objekt Beziehungen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eRechnung & Zahlungen"
 
 #. module: base
 #: view:ir.rule:0
@@ -14599,12 +15358,12 @@ msgstr "zulässige Unternehmen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
 msgid "Deutschland - Accounting"
-msgstr ""
+msgstr "Deutsche Buchführung"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auction
 msgid "Auction Houses"
-msgstr ""
+msgstr "Auktionen & Versteigerungen"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -14857,7 +15616,7 @@ msgstr "Betreuung nach Verkauf"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
 msgid "France - Accounting"
-msgstr ""
+msgstr "Französische Buchführung"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -14867,7 +15626,7 @@ msgstr "Ausführen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_caldav
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "Kalender mit CalDAV freigeben"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -14886,7 +15645,7 @@ msgstr ""
 #: code:addons/orm.py:791
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
-msgstr ""
+msgstr "Serialisierungsfeld `%s` für Ersatzfeld `%s` nicht  gefunden!"
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -15128,7 +15887,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird Plug-In"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -15287,7 +16046,7 @@ msgstr "ir.actions.server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ca
 msgid "Canada - Accounting"
-msgstr ""
+msgstr "Kanadische Buchführung"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -15326,7 +16085,7 @@ msgstr "Implementierung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
 msgid "Venezuela - Accounting"
-msgstr ""
+msgstr "Venezuelanische Buchführung"
 
 #. module: base
 #: model:res.country,name:base.cl
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 97686885d41..7a9c9db6811 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 9926427d9d0..d7bc4f79bbf 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index bf6d7b43643..ef47237de9f 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 6bfbedefca5..fdc9c0340dd 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index b2e08ace3eb..9c200b406c5 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 3f9f047efd9..a5124cc2596 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 104d244a736..9a8ee789f45 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 5fd1fd28561..92461a33610 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 2a6c8bb8057..cac59f27002 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 2ef57e23fd9..74885636856 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index bd49d236ec2..99a346be694 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 63d22e5273e..c2de09b902d 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 4bcc31bc392..3f755a59d14 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -6490,6 +6490,83 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Module d'importation des états bancaires CODA.\n"
+"\n"
+"    Les fichiers supportés sont les fichiers plats CODA en version v2 des "
+"comptes bancaires Belges.\n"
+"    - CODA v1 supporté.\n"
+"    - CODA v2.2 supporté.\n"
+"    - Devises Étrangères supportées.\n"
+"    - Support pour tous les enregistrements de type (0, 1, 2, 3, 4, 8, 9).\n"
+"    - Parsing & logging pour tous les Types de Transactions et les Formats "
+"Structurés de Communications.\n"
+"    - Imputation Automatique des Journaux Financiers via les paramètres de "
+"configuration CODA.\n"
+"    - Support des Journaux multiples par numéro de compte bancaire.\n"
+"    - Support des états multiples de différents comptes bancaires sur un "
+"fichier CODA unique.\n"
+"    - Support pour \"analyse seule\" ('parsing only') CODA des comptes "
+"bancaires (définis comme type='info' dans les enregistrements de "
+"configuration CODA du compte bancaire).\n"
+"    - Analyse CODA mulit-langues, données de configuration pour l'analyse "
+"fournie en EN, NL, FR.\n"
+"\n"
+"    Les fichiers CODA informatiquement lisibles sont analysés et enregistrés "
+"en format texte dans des états bancaires CODA.\n"
+"    Also Bank Statements are generated containing a subset of the CODA "
+"information (only those transaction lines\n"
+"    that are required for the creation of the Financial Accounting "
+"records).\n"
+"    The CODA Bank Statement is a 'read-only' object, hence remaining a "
+"reliable representation of the original CODA file\n"
+"    whereas the Bank Statement will get modified as required by accounting "
+"business processes.\n"
+"\n"
+"    CODA Bank Accounts configured as type 'Info' will only generate CODA "
+"Bank Statements.\n"
+"\n"
+"    A removal of one object in the CODA processing results in the removal of "
+"the associated objects.\n"
+"    The removal of a CODA File containing multiple Bank Statements will also "
+"remove those associated\n"
+"    statements.\n"
+"\n"
+"    The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against the Bank Account Number field\n"
+"       of the Company's CODA Bank Account configuration records (whereby "
+"bank accounts defined in type='info' configuration records are ignored).\n"
+"       If this is the case an 'internal transfer' transaction is generated "
+"using the 'Internal Transfer Account' field of the CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction line is matched against\n"
+"       the reference field of in- and outgoing invoices (supported : Belgian "
+"Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is located via the\n"
+"       Bank Account Number configured on the OpenERP Customer and Supplier "
+"records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated by using the 'Default Account\n"
+"       for Unrecognized Movement' field of the CODA File Import wizard in "
+"order to allow further manual processing.\n"
+"\n"
+"    In stead of a manual adjustment of the generated Bank Statements, you "
+"can also re-import the CODA\n"
+"    after updating the OpenERP database with the information that was "
+"missing to allow automatic reconciliation.\n"
+"\n"
+"    Remark on CODA V1 support:\n"
+"    In some cases a transaction code, transaction category or structured "
+"communication code has been given a new or clearer description in CODA V2.\n"
+"    The description provided by the CODA configuration tables is based upon "
+"the CODA V2.2 specifications.\n"
+"    If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.et
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 4efb155de8c..91ac9510620 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 49b43c872f0..91597862bf5 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 4b353ccc8f6..967b11c89a0 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 71764eba76d..e50c21bd73c 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index e32c2abe895..d98ee515473 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index d2594e495d4..2c5ed383c32 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.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-07-05 04:40+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 281c26be5f0..de2d31683ee 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index c8663a081eb..bab1f557502 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 70a8e7d3a1a..5fc3ece66a8 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index ed37324ec10..0e756def3ee 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/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-07-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15558)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 784c92e5c4c..a7a4c233c3c 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/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-07-05 04:42+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:39+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 154e7e179af..09a985213b8 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 0f517691472..b66cb25933e 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.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-07-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 5a6da9f839a..eb59a102506 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index a6048b6b687..0a83e177d06 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -107,6 +107,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Palīdz pārvaldīt projektus un uzdevumus, tiem sekojot, ģenerējot plānojumus "
+"utt."
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
@@ -220,7 +222,7 @@ msgstr "Svazilenda"
 #: code:addons/orm.py:4206
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "izveidots."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -264,7 +266,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_sales_management
 #: model:ir.module.module,shortdesc:base.module_sale
 msgid "Sales Management"
-msgstr ""
+msgstr "Tirdzniecības Vadība"
 
 #. module: base
 #: view:res.partner:0
@@ -365,7 +367,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Klientu Attiecību Vadība (CRM)"
 
 #. module: base
 #: view:ir.module.module:0
@@ -693,7 +695,7 @@ msgstr "Exports veikts"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr ""
+msgstr "Outlook spraudnis"
 
 #. module: base
 #: view:ir.model:0
@@ -1057,7 +1059,7 @@ msgstr "Tips"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr ""
+msgstr "Lietotājvārds"
 
 #. module: base
 #: code:addons/orm.py:398
@@ -1205,7 +1207,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
 msgid "SugarCRM Import"
-msgstr ""
+msgstr "SugarCRM Imports"
 
 #. module: base
 #: view:res.lang:0
@@ -1228,7 +1230,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr ""
+msgstr "Pārbaudes"
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1355,7 +1357,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
 msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "Ierakstu Kārtas Numerācija"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1461,6 +1463,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Palīdz pārvaldīt ar iepirkumiem saistītus procesus, kā pieprasījumus pēc "
+"cenas piedāvājumiem, piegādātāju rēķinus utt."
 
 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1556,7 +1560,7 @@ msgstr "Float"
 #: model:ir.module.category,name:base.module_category_warehouse_management
 #: model:ir.module.module,shortdesc:base.module_stock
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Noliktavas Vadība"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1585,7 +1589,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu
 msgid "Luxembourg - Accounting"
-msgstr ""
+msgstr "Luksemburga - Grāmatvedība"
 
 #. module: base
 #: model:res.country,name:base.tp
@@ -1987,12 +1991,12 @@ msgstr "Somija"
 #: code:addons/base/res/res_company.py:156
 #, python-format
 msgid "Website: "
-msgstr ""
+msgstr "Vietne: "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
 msgid "Settings"
-msgstr ""
+msgstr "Uzstādījumi"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -2093,7 +2097,7 @@ msgstr "Logotips"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cr
 msgid "Costa Rica - Accounting"
-msgstr ""
+msgstr "Kostarika - Grāmatvedība"
 
 #. module: base
 #: view:ir.module.module:0
@@ -2166,7 +2170,7 @@ msgstr "Jaunināto moduļu skaits"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr ""
+msgstr "Metode"
 
 #. module: base
 #: view:res.partner.event:0
@@ -2300,7 +2304,7 @@ msgstr ""
 #. module: base
 #: field:ir.mail_server,smtp_debug:0
 msgid "Debugging"
-msgstr ""
+msgstr "Atkļūdošana"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_helpdesk
@@ -2410,12 +2414,12 @@ msgstr "Esošā Likme"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
 msgid "Ideas"
-msgstr ""
+msgstr "Idejas"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Konvertēt Potenciālo darījumu uz Cenas Pieprasījumu"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_analytic_plans
@@ -2452,7 +2456,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -2577,7 +2581,7 @@ msgstr ""
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr ""
+msgstr "Menedžeris"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -2627,6 +2631,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Ļauj instalēt dažādus rīkus, lai vienkāršotu un uzlabotu OpenERP atskaišu "
+"izveidi."
 
 #. module: base
 #: view:res.lang:0
@@ -2637,7 +2643,7 @@ msgstr "%y - Gads bez gadsimta [00,99]."
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr ""
+msgstr "Fakss: "
 
 #. module: base
 #: model:res.country,name:base.si
@@ -2647,7 +2653,7 @@ msgstr "Slovēnija"
 #. module: base
 #: help:res.currency,name:0
 msgid "Currency Code (ISO 4217)"
-msgstr ""
+msgstr "Valūtas kods (ISO 4217)"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_log_act_window
@@ -2769,7 +2775,7 @@ msgstr ""
 #: field:ir.module.module,application:0
 #: field:res.groups,category_id:0
 msgid "Application"
-msgstr ""
+msgstr "Programma"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -2963,7 +2969,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_quality_manual
 msgid "Wiki: Quality Manual"
-msgstr ""
+msgstr "Wiki: Kvalitātes rokasgrāmata"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -2991,7 +2997,7 @@ msgstr "HR Sektors"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_dashboard_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Administrēšanas instrumentu panelis"
 
 #. module: base
 #: code:addons/orm.py:4408
@@ -3076,7 +3082,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_contract
 msgid "Employee Contracts"
-msgstr ""
+msgstr "Darbinieku līgumi"
 
 #. module: base
 #: model:ir.module.module,description:base.module_wiki_faq
@@ -3140,7 +3146,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_survey
 msgid "Survey"
-msgstr ""
+msgstr "Aptauja"
 
 #. module: base
 #: view:base.language.import:0
@@ -3432,7 +3438,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "Grāmatvedība"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_payment
@@ -15131,7 +15137,7 @@ msgstr "Partneri: "
 #. module: base
 #: field:res.partner.bank,name:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankas Konts"
 
 #. module: base
 #: model:res.country,name:base.kp
@@ -15147,7 +15153,7 @@ msgstr "Izveidot Objektu"
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "Konteksts"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
@@ -15162,12 +15168,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Nākotnes Plāni"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Rēķina Izrakstīšana, Piegādājot preci"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index bc690ab40ca..3414ae7063c 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 8559c9084c7..c80aa9afb14 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -249,7 +249,7 @@ msgstr "Швецарь"
 #: code:addons/orm.py:4206
 #, python-format
 msgid "created."
-msgstr "үүсгэсэн."
+msgstr ""
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -344,7 +344,7 @@ msgstr "Тайлан"
 #: field:res.partner,subname:0
 #: field:res.partner.address,name:0
 msgid "Contact Name"
-msgstr "Харьцах хүн"
+msgstr "Харилцагчийн нэр"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:56
@@ -2940,7 +2940,7 @@ msgstr "Менежер"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr "Өөрчлөн тохируулалт"
+msgstr "Өөриймшүүлэлт"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -3867,7 +3867,7 @@ msgstr "Баазын бүтэц"
 #: model:ir.model,name:base.model_partner_massmail_wizard
 #: view:partner.massmail.wizard:0
 msgid "Mass Mailing"
-msgstr "Э-мэйл илгээх"
+msgstr "Масс Имэйл илгээх"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -7474,7 +7474,7 @@ msgstr "Цагийн Хуваарь"
 #. module: base
 #: field:res.partner,function:0
 msgid "function"
-msgstr "функц"
+msgstr "үүрэг"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
@@ -7754,7 +7754,7 @@ msgstr "Хувилбар Ахиулах"
 #: field:res.partner,address:0
 #: view:res.partner.address:0
 msgid "Contacts"
-msgstr "Харьцах хүмүүс"
+msgstr "Харилцагч"
 
 #. module: base
 #: model:res.country,name:base.fo
@@ -8982,7 +8982,7 @@ msgstr "Том бүхэл тоо"
 #: selection:res.partner.address,type:0
 #: selection:res.partner.title,domain:0
 msgid "Contact"
-msgstr "Харилцах хүн"
+msgstr "Харилцагч"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
@@ -10831,6 +10831,44 @@ msgid ""
 "    * Graph of stock value variation\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь OpenERP-д үйлдвэрлэлийг менеж хийх үндсэн модуль юм.\n"
+"=======================================================================\n"
+"\n"
+"Онцлог:\n"
+"---------\n"
+"    * Хадгалуулах / Захиалуулах (мөр бүрээр)\n"
+"    * Олон түвшний жор, хязгааргүй\n"
+"    * Олон түвшний урсгал, хязгааргүй\n"
+"    * Шинжилгээний санхүүтэй уялдсан үйлдвэрлэлийн урсгал болон дамжлага\n"
+"    * Тогтол хугацааны тооцоолол / Яг Хугацаандааа модуль\n"
+"    * Олон-POS, Олон-Агуулах\n"
+"    * Эрэмбэлэх ялгаатай аргууд\n"
+"    * Өртөгийн арга бараагаар: Стандарт үнэ, Дундаж үнэ\n"
+"    * Бэрхшээл болон хэрэгцээний хялбар шинжилгээ\n"
+"    * Маш уян хатан\n"
+"    * Жоруудыг бүтцээр нь, завсрынхаар нь гэх мэт гүйцэд шинжилгээ, үзлэг\n"
+"\n"
+"Хадгалж болох бараа, үзүүлж болох үйлчилгээ зэрэгтэй бүрэн уялдаж дэмжиж "
+"ажилладаг. Үйлчилгээ нь програм хангамжийн бусад хэсэгтэй бүрэн уялддаг. "
+"Тухайлбал жор дотор дэд гэрээний үйлчилгээг оруулж тодорхойлж болох бөгөөд "
+"үйлдвэрлэлийн угсаргааны явцад үйлчилгээг худалдан авах захиалгыг автоматаар "
+"үүсгэдэг.\n"
+"\n"
+"Тайлангууд модулиар өгөгддөг:\n"
+"--------------------------------\n"
+"    * Жорын бүтэц, бүртэл хэсгийн тайлан\n"
+"    * Дамжлагын ачааллын урьдчилсан таамаглал\n"
+"    * Үйлдврэлэлийн захиалгын баримт хэвлэх\n"
+"    * Барааны урьдчилсан таамаг\n"
+"\n"
+"Модулийн Хянах Самбар:\n"
+"----------------------------------\n"
+"    * Дараагийн үйлдвэрлэлийн захиалгын жагсаалт\n"
+"    * Сондгой бэлтгэн нийлүүлэлтийн жагсаалт\n"
+"    * Дамжлагын ачааллыг график\n"
+"    * Барааны үнийн хазайлтын график\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -11199,6 +11237,33 @@ msgid ""
 "mail. \n"
 "    "
 msgstr ""
+"\n"
+"Ирж байгаа имэйлийг POP / IMAP серверүүдээс хүлээж авдаг.\n"
+"=============================================\n"
+"\n"
+"POP/IMAP имэйлийн параметрүүдийг тохируулаад энэ хаягт ирж байгаа "
+"имэйлүүдийг OpenERP-руу татаж авдаг. Бүх POP3/IMAP серверүүд дэмжигддэг. "
+"SSL/TLS серверүүд ч дэмжигдэнэ.\n"
+"\n"
+"Энэ нь имэйл оролцсон OpenERP-н маш олон ажлын урсгал дээр төрөл бүрийн "
+"баримтыг үүсгэж болно. Тухайлбал:\n"
+"\n"
+" * CRM Сэжим/Боломж\n"
+" * CRM Гомдол\n"
+" * Төслийн асуудал\n"
+" * Төслийн даалгавар\n"
+" * Хүний Нөөц Бүрдүүлэлт (Өргөдөл гаргагч)\n"
+" * гм.\n"
+"\n"
+"Өөрт хэрэг болох модулийг суулгаад баримтын төрлийг (Сэжим, Төслийн асуудал, "
+"гм) имэйл хаягуудад оноож өгнө. Эдгээр хаягт ирсэн имэйлүүд нь харгалзах "
+"баримтуудыг автоматаар үүсгэнэ. Эдгээрт шууд OpenERP дотроосоо хариулж болох "
+"бөгөөд хариу нь эргээд энэ баримт дээрээ ирж бүх харилцаа нь ярилцлага "
+"байдлаар бүгд нэг дор хөтлөгддөг.\n"
+"\n"
+"Бүр цаашилбал өөрийн тодорхойлсон үйдлийг (техник түвшинд бол: Серверийн "
+"Үйлдлүүд) ирж байгаа имэйл дээр ажиллуулж болно. \n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -11890,6 +11955,38 @@ msgid ""
 "            "
 "fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 msgstr ""
+"%s-н цагалбар харагдацыг үүсгэхэд өгөгдөл хангалтгүй байна, date_stop эсвэл "
+"date_delay алга байна\" % (self._name)))\n"
+"\n"
+"        return view\n"
+"\n"
+"    def _get_default_search_view(self, cr, uid, context=None):\n"
+"        \"\n"
+"        :param cr: database cursor\n"
+"        :param int user: user id\n"
+"        :param dict context: connection context\n"
+"        :returns: an lxml document of the view\n"
+"        :rtype: etree._Element\n"
+"        \"\n"
+"        form_view = self.fields_view_get(cr, uid, False, 'form', "
+"context=context)\n"
+"        tree_view = self.fields_view_get(cr, uid, False, 'tree', "
+"context=context)\n"
+"\n"
+"        # TODO it seems _all_columns could be used instead of fields_get (no "
+"need for translated fields info)\n"
+"        fields = self.fields_get(cr, uid, context=context)\n"
+"        fields_to_search = set(\n"
+"            field for field, descriptor in fields.iteritems()\n"
+"            if descriptor.get('select'))\n"
+"\n"
+"        for view in (form_view, tree_view):\n"
+"            view_root = etree.fromstring(view['arch'])\n"
+"            # Only care about select=1 in xpath below, because select=2 is "
+"covered\n"
+"            # by the custom advanced search in clients\n"
+"            "
+"fields_to_search.update(view_root.xpath(\"//field[@select=1]/@name"
 
 #. module: base
 #: constraint:res.users:0
@@ -12472,6 +12569,8 @@ msgid ""
 "Checked if this is an OpenERP Publisher's Warranty contract (versus older "
 "contract types"
 msgstr ""
+"OpenERP-ийн нийтлэгчийн баталгааны гэрээ бол энэ нь тэмдэглэгдсэн байна "
+"(хуучин гэрээний төрөлүүдээс ялгаатай"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -13620,7 +13719,7 @@ msgstr ""
 #. module: base
 #: field:res.groups,trans_implied_ids:0
 msgid "Transitively inherits"
-msgstr ""
+msgstr "Дамжиж давхар удамшдаг"
 
 #. module: base
 #: field:ir.default,ref_table:0
@@ -14090,6 +14189,38 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь state, date_start,date_stop буюу төлөв, эхлэх огноо, зогсох "
+"огноо гэсэн талбаруудийг үйлдвэрлэлийн захиалгын үйлдлийн мөрүүдэд нэмдэг "
+"(\"Ажлын төв\" хавтас дотор)\n"
+"============================================================================="
+"================================\n"
+"\n"
+"Төлөв: ноорог, батлагдсан, хийгдсэн, цуцалсан\n"
+"Үйлдвэрлэлийн цахиалгыг дуусгах, батлахад мөрүүдийн төлөв нь дагаж "
+"өөрчлөгддөг.\n"
+"\n"
+"Үүсгэгдэх меню:\n"
+"    Үйлдвэрлэл > Үйлдвэрлэл > Ажлын захиалгууд\n"
+"\n"
+"Үйлдвэрлэлийн захиалгын \"Ажлын төв\"-н мөрүүдийн харагдац.\n"
+"\n"
+"Үйлдвэрлэлийн захиалгын ажлын төв хавтаст дараах даруулуудыг нэмдэг:\n"
+"    * эхлэх (батлагдсан төлөвт оруулна), date_start буюу эхлэсэн огноог "
+"тааруулна\n"
+"    * хийгдсэн (хийгдсэн төлөвт оруулна), date_stop буюу зогссон огноог "
+"тааруулна\n"
+"    * ноороглох (ноорог төлөвт оруулна)\n"
+"    * цуцлах (төлөвийг цуцлагдсан төлөвтэй болгоно)\n"
+"\n"
+"Үйлдвэрлэлийн захиалга \"үйлдвэрлэхэд бэлэн\" болоход үйлдлүүд \n"
+"'батлагдсан' төлөвтэй болох ёстой. Үйлдвэрлэлийн захиалга хийгдсэн төлөвтэй "
+"болоход бүх үйлдлүүд хийгдсэн болох ёстой\n"
+"\n"
+"хугацаа талбар нь авсан хугацаа(stop date - start date).\n"
+"Иймээс онолын хугацаа, бодит хугацааг жиших боломжтой болно.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_auction
@@ -14113,6 +14244,24 @@ msgid ""
 "    * Objects By Day (graph)\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь зураач, дуудлага худалдааны бүтээл, худалдан авагч, худалдагч "
+"нарыг бүртгэж менеж хийдэг.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Энэ нь дуудлага худалдааны үнэ хаялцах, зарагдсан барааны төлсөн "
+"төлөөгүйгээр ангилж хөтлөх, хүргэлтийн төлөв байдал гээд энэ бүгдийг бүгдийг "
+"хөтлөж менеж хийдэг.\n"
+"\n"
+"Дуудлага худалдааны хянах самбар нь:\n"
+"    * Сүүлийн обьектууд (жагсаалт)\n"
+"    * Сүүлийн урьдчилгаа (жагсаалт)\n"
+"    * Обьектуудын статистик (жагсаалт)\n"
+"    * Нийт дутуу төлбөр (график)\n"
+"    * Хамгийн бага/Төлөгдөөгүй/Хамгийн их (график)\n"
+"    * Обьектууд өдөрөөр (график)\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_crypt
@@ -14149,6 +14298,37 @@ msgid ""
 "\n"
 "                    "
 msgstr ""
+"\n"
+"Өгөгдлийн бааз дахь цэвэр текст нууц үгийг илүү нууцлаг hash бүхий нууц "
+"үгээр сольдог\n"
+"===============================================================\n"
+"Байгаа хэрэглэгчдийн хувьд base_crypt модулийг суулгамагц цэвэр текст нууц "
+"үгүүд илүү нууцлал сайтай шифрлэгдсэн нууц үгээр солигддог.\n"
+"\n"
+"Бүх нууц үгүүд шууд өгөгдлийн баазаас унших боломжгүй болж бүхд илүү "
+"нууцлалтай, шифрлэгдсэн, давстай шифрлэгдсэн,  cryptographic hash хийгдсэн "
+"болж солигддог.\n"
+"\n"
+"Энэ модулийг суулгасан дараа мартсан нууц үгийг лавлаж, асуух сэргээх "
+"боломжгүй болно. Зөвхөн шинэ нууц үгийг тохируулах боломжтой болно.\n"
+"\n"
+"Нууцлалын анхааруулга\n"
+"++++++++++++++++\n"
+"Энэ модулийг суулгаснаар нууцлалын бусад асуудлыг тоохгүй орхиж болохгүй. "
+"Учир нь XML-RPCS, HTTPS зэрэг нууцлалтай протоколь ашиглаж байгаа биш л бол "
+"нууц үгүүд нь сүлжээгээр цэвэр текст байдлаар дамжина. Мөн түүнчлэн нууц "
+"үгээс бусад өгөгдлийн баазад байгаа өгөгдлийг нууцладаггүй. Иймээс нууцлалыг "
+"сайжруулах асуудал нь системийн бүхэл хэсэгт систем админ өөрөө хийж хангах "
+"ёстой. Тухайлбал: өгөгдлийн баазын нөөцлөлтүүдийг нууцалж хамгаалах, "
+"системийн файлуудыг хамгаалах, алсын зайны shell хандалтыг хамгаалах, "
+"серверийн физик хаяг порт зэрэгийг хамгаалах бүх л арга хэмжээг авах ёстой.\n"
+"\n"
+"LDAP эрхийн хяналттай холбох\n"
+"+++++++++++++++++++++++++++++++++++\n"
+"Энэ модуль нь одоогоор ``user_ldap`` модультай нийцтэй биш бөгөөд хэрэв "
+"хоюуланг нь суулгавал ldap эрхийн хяналтыг тэр чигт нь идэвхгүй болгодог.\n"
+"\n"
+"                    "
 
 #. module: base
 #: field:ir.actions.act_window,view_id:0
@@ -14261,6 +14441,10 @@ msgid ""
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
 msgstr ""
+"Бидний бүртгэлээс дараах төлбөрүүд нь хугацаа хэтэрсэн байдалтай байна. "
+"Хэрэв төлөгдсөн бол энэ мэдэгдлийг тоохгүй байж болно. Гэхдээ өөрийн данс, "
+"тооцоотой холбоотой аливаа асуулт байвал бидэнд хандана уу. Танд урьдчилан "
+"баярлалаа.\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
@@ -14293,7 +14477,7 @@ msgstr ""
 #. module: base
 #: help:ir.values,value:0
 msgid "Default value (pickled) or reference to an action"
-msgstr ""
+msgstr "Анхны утга (pickled - дарсан) эсвэл сурвалж үйлдэл"
 
 #. module: base
 #: sql_constraint:res.groups:0
@@ -14311,6 +14495,14 @@ msgid ""
 "you can modify in OpenOffice. Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Энэ модуль нь OpenERP-н OpenOffice залгаастай хамт хэрэглэгддэг.\n"
+"=========================================================\n"
+"\n"
+"Энэ модуль нь .sxw тайланг Импортлох/Экспортлох харилцах цонхыг нэмдэг "
+"бөгөөд ингэснээр тайланг OpenOffice-р засварлах боломжтой болдог. Засварлаж "
+"дуусаад адилхан харилцах цонхоор буцаагаад зассан хувилбарыг сервер ачаалж "
+"болно.\n"
 
 #. module: base
 #: view:ir.sequence:0
@@ -14492,6 +14684,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Бидэнд оронд байгаа зүйл бол:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_data
@@ -15017,11 +15211,12 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"Сонгох Сонголтын илэрхийлэл нь  [('key','Label'), ...] форматтай байх ёстой!"
 
 #. module: base
 #: view:ir.filters:0
 msgid "Current User"
-msgstr ""
+msgstr "Идэвхтэй Хэрэглэгч"
 
 #. module: base
 #: field:res.company,company_registry:0
@@ -15274,6 +15469,23 @@ msgid ""
 "using it, otherwise it may crash.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модулийн зорилго нь бусад модулийн чанарыг шалгах зориулалттай.\n"
+"================================================================\n"
+"\n"
+"Энэ нь OpenERP дахь модулиудын модулийн жагсаалт дээр ажиллах харилцах "
+"цонхыг үүсгэдэг.\n"
+"Энэ харилцах цонхоор модулиудыг OpenERP кодчилолын стандарт, хурдын оновчтой "
+"байдал зэрэг үзүүлэлтүүдээр үнэлэх боломжийг олгодог...\n"
+"\n"
+"Энэ модуль мөн та өөрийн чанарын шалгалтыг хийх framework-г өгдөг.\n"
+"Программстуудын хувьд илүү дэлгэрэнгүй танилцахын тулд base_module_quality\\"
+"README.txt файлыг унших хэрэгтэй.\n"
+"\n"
+"САНАМЖ: Энэ модуль нь модуль нь ZIP файл байдлаар ажиллаж чадахгүй учир "
+"хэрэглэхийн өмнө задлаж байж хэрэглэх хэрэгтэй. Тэгэхгүй бол модуль нурж "
+"гацдаг.\n"
+"    "
 
 #. module: base
 #: field:res.partner.bank,bank_name:0
@@ -15335,6 +15547,9 @@ msgid ""
 "are available. To add a new language, you can use the 'Load an Official "
 "Translation' wizard available from the 'Administration' menu."
 msgstr ""
+"Орчуулга байгаа бол хэрэглэгчийн график интерфейс хэрэглэгдэх анхны хэл. "
+"Шинэ хэл нэмэхдээ 'Албан ёсны орчуулга ачаалах' харилцах цонхыг 'Удирдлага' "
+"менюгээс сонгоно."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -15900,7 +16115,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_partner_wizard_ean_check
 msgid "Ean Check"
-msgstr ""
+msgstr "Ean шалгалт"
 
 #. module: base
 #: view:res.partner:0
@@ -16701,7 +16916,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr "Хүн хайх"
+msgstr "Харилцагч хайх"
 
 #. module: base
 #: view:ir.attachment:0
@@ -16775,7 +16990,7 @@ msgstr "Хязгаар"
 #: help:workflow.transition,group_id:0
 msgid ""
 "The group that a user must have to be authorized to validate this transition."
-msgstr ""
+msgstr "Энэ шилжилтийг шалгах хэрэглэгчийн зөвшөөрөгдөх групп"
 
 #. module: base
 #: code:addons/orm.py:791
@@ -16890,6 +17105,40 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Имэйл үлгэрчлэл (Анхны байсан Power Email by Openlabs-ийн хялбаршуулсан "
+"хувилбар)\n"
+"============================================================================="
+"\n"
+"\n"
+"OpenERP-н аль ч баримт (борлуулалт, нэхэмжлэл гэх мэт)-д хэрэглэж болох "
+"имэйлийг зохиомжлох боломжийг олгодог. Зохиомжлохдоо илгээгч, хүлээн авагч, "
+"гарчиг, бие(биеийг HTML болон Text байдлаар) гэх бүх хэсгийг зохиомжлох "
+"боломжийг олгодог.Түүнчлэн имэйлдээ автоматаар хавсралт оруулах, хэвлэх, "
+"тайлан хавсаргах зэрэг боломжуудыг оруулж өгч болдог.\n"
+"\n"
+"Шилдэг хэрэглээний хувьд үлгэрүүд нь үүсгэхдээ холбогдох баримтуудын динамик "
+"аттрибутуудыг шууд авч үүсдэг байх явдал нь чухал. Жишээлбэл харилцагчийн "
+"улсын нэрийг имэйлдээ оруулах болон аюулгүйн үүднээс заавал тусгагдах анхны "
+"утгуудыг оруулах зэрэгээр хэрэглэж болно. Үлгэр болгон нь динамик утгуудыг "
+"оруулах туслагчтай байдаг.\n"
+"\n"
+"Түүнчлэн хэрэв сонголтыг зөвшөөрсөн бол холбогдох баримтын баруун гар талд "
+"имэйл үүсгэх туслагч гарч ирдэг. (ө.х. Нэхэмжлэлүүд).\n"
+"Энэ нь имэйлийг хялбараар илгээх боломжийг олгодог. Өөрөөр хэлбэл шууд бэлэн "
+"үлгэрээр динамик утгууд гүйцээгдсэн имэйлийг үүсгэж шаардлагатай бол "
+"өөрчлөлт хийгээд шууд илгээдэг. Түүнчлэн энэ боломж олон баримт дээр "
+"хэрэглэсэн тохиолдолд масс имэйл илгээх боломжтой байдаг.\n"
+"\n"
+"Эдгээр имэйл үлгэрүүд мөн нөгөөтэйгүүр маркетингийн компанит системийн гол "
+"зүрх болж байдаг.\n"
+"(``marketing_campaign`` модулийг харна уу), хэрэв томоохон компанит ажлыг "
+"OpenERP-д хэрэглэхээр бол хэрэглэж болно.\n"
+"\n"
+"Техникийн тэмдэглэл: Анхны  Power Email by Openlabs-н имэйл үлгэр хийдэг "
+"хэсэг нь хэрэглэгдэж үлдсэн.\n"
+"\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17058,11 +17307,13 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing."
 msgstr ""
+"Санхүүгийн боловсруулалтын хэрэгцээг хангахад тусалдаг, хэрэв та нягтлан бол "
+"зөвхөн нэхэмжлэлийг суулгахыг зөвлөе."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird залгаас"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -17094,6 +17345,9 @@ msgid ""
 "        OpenERP Web test suite.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP вебийн тестийн иж бүрдэл.\n"
+"        "
 
 #. module: base
 #: view:ir.values:0
@@ -17118,7 +17372,7 @@ msgstr "Өнгө Өөрчлөх"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "МТ салбар"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -17143,11 +17397,16 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Тусгаарлагчийн формат нь [,n] гэсэн хэлбэртэй байх ёстой. Энд 0 < n :Нэгжийн "
+"цифр нь.-1 -с эхлээд тусгаарлалтийг төгсгөнө. ө.х. [3,2,-1] нь 106500 гэсэн "
+"тоог 1,06,500 байдлаар илэрхийлнэ;[1,2,-1] нь 106,50,0 гэсэн байдлаар "
+"илэрхийлнэ;[3] нь 106,500 гэсэн байдлаар илэрхийлнэ. Өгөгдсөн ',' бүх "
+"тохиолдолд мянгатын тусгаарлагч байна"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "Автомат Суулгалт"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -17158,7 +17417,7 @@ msgstr "Япон"
 #: code:addons/base/ir/ir_model.py:357
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "Нэг удаад зөвхөн нэг баганын нэрийг өөрчилж чадна!"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -17199,6 +17458,33 @@ msgid ""
 "Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь маркетингийн компанит ажлаар сэжимийг автоматжуулдаг (компанит "
+"ажил нь бүх төрлийн нөөц байж болно. Зөвхөн CRM сэжимээр хязгаарлагдахгүй).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"Компанит ажил нь динамик бөгөөд олон суваг юм. Процесс нь дараах байдалтай:\n"
+"    * Маркетингийн компанит ажлыг ажлын ургсал шигээр зохиомжлох хэрэгтэй "
+"бөгөөд үүнд имэйл үлгэр, хэвлэх илгээх тайлангууд, өөриймшүүлсэн үйлдлүүд "
+"зэрэг зүйлс хамаарна.\n"
+"    * Компанит ажилд хэрэглэгдэх сегментүүдийг тодорхойлно. (ө.х зөвхөн "
+"тодорхой хэдэн улсаас сэжмийг авна гэх мэт.)\n"
+"    * Тестийн горимд компанит ажлыг симулаци хийж туршиж болно. Ингээд өшөө "
+"нарийвчлан тохируулж болно.\n"
+"    * Гар горимоор жинхэнэ компанит ажлыг эхлүүлж болно. Ингээд бүх үйлдэл "
+"гар шалгалтыг шаардах болно.\n"
+"    * Эцэст нь компанит ажлыг эхлүүлж бүх зүйлс бүрэн автомат хийгдэж "
+"байгааг статистикуудаар харж эхлэнэ.\n"
+"\n"
+"Компанит ажил явагдаж байх үед ч гэсэн сегментчлэл, ажлын урсгал зэрэгийг "
+"нарийвчлан тохируулах ажлыг үргэлжлүүлэн хийх боломжтйо.\n"
+"\n"
+"Санамж: Хэрэв танд туршилтын үзүүлэн өгөгдөл хэрэгтэй бол "
+"marketing_campaign_crm_demo модулийг суулгаж болно. Гэхдээ энэ нь мөн CRM "
+"модулийн туршилтын өгөгдөлтэй суулгадаг тул илүүж туршилтын өгөгдөл сэжимүүд "
+"үүсдэгийг анхаарах хэрэгтэй.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -17277,7 +17563,7 @@ msgstr "Нөхцөл"
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
-msgstr ""
+msgstr "1-тэй тэнцэн ханштай валют руу хөрвөх тухайн валютын ханш."
 
 #. module: base
 #: field:ir.ui.view,name:0
@@ -17387,7 +17673,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
 msgid "eMail Gateway for Project Issues"
-msgstr ""
+msgstr "Төслийн Асуудлуудын Имэйл үүд"
 
 #. module: base
 #: field:res.partner.bank,partner_id:0
@@ -17423,13 +17709,13 @@ msgstr "Дараагийн дугаарлалт нь энэ утгаар нэм
 #: code:addons/orm.py:341
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "Browse хийж байгаа бичлэгийн буруу ID, %r-г авлаа, бүхэл байх ёстой."
 
 #. module: base
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr "Функц"
+msgstr "Үүрэг"
 
 #. module: base
 #: view:res.widget:0
@@ -17442,6 +17728,8 @@ msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
 msgstr ""
+"Сэжим, боломж, хүсэлт, асуудал зэрэгийг ашиглана захиалагч, ирээдүйн "
+"захиалагчтай харилцааг менеж хийдэг."
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -17587,6 +17875,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь нэг үйлдвэрлэлийн захиалгаас хэд хэдэн бараа үүсгэх боломжийг "
+"олгодог.\n"
+"============================================================================="
+"\n"
+"\n"
+"Дэд бараануудыг жор дотор тохируулах боломжтой.\n"
+"\n"
+"Энэ модуль үгүйгээр:\n"
+"    A + B + C -> D\n"
+"\n"
+"Энэ модультайгаар:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lk
@@ -17619,6 +17921,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Энэ модуль нь ямар ч хөгжүүлэлтгүйгээр шинэ модуль үүсгэх боломжийг "
+"олгодог.\n"
+"======================================================================\n"
+"\n"
+"Энэ нь бүх үйлдлийг үйлдэл бичих үед бичиж аваад .ZIP модулийг үүсгэдэг. "
+"Иймээс та өөрийн модулийг шууд клиент хандалтаас үүсгэнэ.\n"
+"\n"
+"Энэ хувилбар нь бичлэг үүсгэх, бичлэг засах байдлаар ажилладаг. Энэ нь бүх "
+"виджетүүдийн хамаарлыг дахин тооцоолдог. (many2one, many2many, ...) Энэ нь "
+"мөн ажлын урсгал болон жишээ өгөгдөл, өгөгдөл шинэчлэх зэрэгийг дэмждэг.\n"
+"\n"
+"Энэ боломж нь хялбараар өөриймшүүлсэн бөгөөд ашиглах, дахин ашиглах "
+"боломжтой модулиудыг хялбараар үүсгэх боломжийг олгодог.\n"
+"\n"
+"Яаж хэрэглэх вэ:\n"
+"Удирдлага/Өөриймшүүлэлт/Модуль үүсгэх/Өөриймшүүлэлтийг модуль болгох "
+"экспортлох харилцах цонхыг хэрэглэнэ.\n"
+"Огноо цагийн нөхцөл, бичлэг хийх обьектуудыг сонгоод бичлэгийг хийж эхлэнэ.\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 298c6ce0676..1542c677529 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:41+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 71a8dee3e68..818bd5c4602 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,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-07-05 04:41+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -6141,7 +6141,7 @@ msgstr "Officiële vertaling laden"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr "Annuleer journaalpsoten"
+msgstr "Annuleer journaalposten"
 
 #. module: base
 #: view:ir.actions.server:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 6165893d26d..cf2cc84f2fd 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index f67d9c46d85..b0e489d3b03 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,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-07-05 04:44+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 983990df5b3..b60b9b98d76 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 73c9f249850..97cbcce0eb6 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 6111d2ed4e8..f079b8bd10a 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 6cbed7a24fa..633734c1e67 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 71b3a748aa7..94ee24e819d 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 066ab3e47c0..f9eeb1456c2 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 69d4b2c36fc..b1f0478ed8a 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,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-07-05 04:39+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:36+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index a0ec7a1a497..e8c74060cc3 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.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-07-05 04:45+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:42+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 49af1e2bc1a..5c187aeec8b 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index a2b2f917674..2e9ff2e0539 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -893,7 +893,7 @@ msgstr "Albanien / Shqip"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr "Opportunities"
+msgstr "Affärsmöjligheter"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -923,6 +923,8 @@ msgid ""
 "The module adds google contact in partner address and add google calendar "
 "events details in Meeting"
 msgstr ""
+"Modulen lägger till google-kontakter i företagsadresser och lägger till "
+"googlekalenderhändelser i möteskalendern"
 
 #. module: base
 #: view:res.users:0
@@ -1628,8 +1630,8 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
-"represenrerar ett blanksteg. Skriver in ett blanksteg i motsvarande position "
-"i översättningen "
+"Tillgång till alla fält relaterade till aktuellt objekt via uttryck, "
+"exempelvis object.partner_id.name "
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -1989,7 +1991,7 @@ msgstr "7.  %H:%M:%S      ==> 18:25:20"
 #: view:res.partner.category:0
 #: field:res.partner.category,partner_ids:0
 msgid "Partners"
-msgstr "Partners"
+msgstr "Företag"
 
 #. module: base
 #: field:res.partner.category,parent_left:0
@@ -2348,7 +2350,7 @@ msgstr "aktiv"
 #, python-format
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
-msgstr "Kan inte skapa nästa id eftersom partnern har ett alfanumeriskt id."
+msgstr "Kan inte skapa nästa id eftersom företaget har ett alfanumeriskt id."
 
 #. module: base
 #: view:ir.attachment:0
@@ -2971,9 +2973,9 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
-"Visa och hantera listan av alla länder som kan bli tilldelade dina partners "
-"uppgifter. Du kan skapa eller ta bort länder så att du är säker på att de "
-"som du jobbar på kommer att underhållas."
+"Visa och hantera listan av alla länder som kan bli tilldelade dina "
+"företagsuppgifter. Du kan skapa eller ta bort länder så att du är säker på "
+"att de som du jobbar på kommer att underhållas."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -3242,7 +3244,7 @@ msgstr "Kalender"
 #. module: base
 #: field:res.partner.address,partner_id:0
 msgid "Partner Name"
-msgstr "Partnernamn"
+msgstr "Företagsnamn"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3842,9 +3844,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
-"Den har wizarden hjälper dig med att lägga till ett nytt språk i ditt "
-"OpenERP system. Efter att språket laddats in blir det tillgängligt för "
-"användare och partners."
+"Den har guiden hjälper dig med att lägga till ett nytt språk i ditt OpenERP-"
+"system. Efter att språket laddats in blir det tillgängligt för användare och "
+"företag."
 
 #. module: base
 #: view:ir.model:0
@@ -3857,7 +3859,7 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
-"Momsnummer. Markera denna om partnern skall ha moms. Används av "
+"Momsnummer. Markera denna om företaget skall debiteras moms. Används av "
 "momsrapporten."
 
 #. module: base
@@ -4265,7 +4267,7 @@ msgstr "Åtgärdsbeskriivning"
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr "Markera denna om partnern är en kund."
+msgstr "Markera denna om företaget är en kund."
 
 #. module: base
 #: help:ir.module.module,auto_install:0
@@ -4344,8 +4346,8 @@ msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this partner will be printed in this language. If not, it will be english."
 msgstr ""
-"Om det valda språket has installerats i systemet skriva alla dokumnet "
-"relaterade till partnern i detta språk. Annars används engelska."
+"Om det valda språket has installerats i systemet används detta språk för "
+"alla dokument till företaget. Annars används engelska."
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -4503,6 +4505,19 @@ msgid ""
 "You can also use the geolocalization without using the GPS coordinates.\n"
 "    "
 msgstr ""
+"\n"
+"Denna modul används av OpenERP SA för att omdirigera kunder till sina "
+"företag, baserat på geolokalisering.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"Du kan geolocalize dina affärsmöjligheter med hjälp av denna modul.\n"
+"\n"
+"Använd geolokalisering när du tilldelar affärsmöjligheter till företag.\n"
+"Bestäm GPS-koordinater enligt företagsadress .\n"
+"Det mest lämpliga företaget kan tilldelas.\n"
+"Du kan också använda geolokalisering utan att använda GPS-koordinater.\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,help:0
@@ -5262,6 +5277,13 @@ msgid ""
 "revenue\n"
 "reports, etc."
 msgstr ""
+"Generera dina fakturor från Utgifter, Tidrapporter ...\n"
+"Modul för att skapa fakturor baserade på kostnader (personal, utgifter, "
+"...).\n"
+"================================================== ========\n"
+"\n"
+"Du kan definiera prislistor i objektkonto, göra några teoretiska intäkts-\n"
+"rapporter etc."
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5456,13 +5478,13 @@ msgid ""
 "The internal user that is in charge of communicating with this partner if "
 "any."
 msgstr ""
-"Den interna användare som hanterar kommunikationen med denna partner, om "
+"Den interna användare som hanterar kommunikationen med detta företag, om "
 "sådan finns."
 
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr "Överliggande partner"
+msgstr "Överliggande företag"
 
 #. module: base
 #: view:ir.module.module:0
@@ -5614,7 +5636,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
 msgid "Starter Partner"
-msgstr ""
+msgstr "Startföretag"
 
 #. module: base
 #: help:ir.model.fields,relation_field:0
@@ -6296,6 +6318,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"Den här modulen låter dig hantera dina kontakter\n"
+"=======================================\n"
+"\n"
+"Det låter dig definiera:\n"
+"* Kontakter utan samband med ett företag,\n"
+"* Kontaktuppgifter arbetar på flera adresser (eventuellt för olika "
+"företag),\n"
+"* Kontakter med eventuellt olika funktioner för varje  jobbadress\n"
+"\n"
+"Det ger också nya menyalternativ i\n"
+"Inköp / adressbok / kontakter\n"
+"Försäljning / adressbok / kontakter\n"
+"\n"
+"Uppmärksamma att denna modul omvandlar de befintliga adresserna till "
+"\"adresser + kontakter\". Det innebär att vissa områden adresserna kommer "
+"att saknas (som kontaktens namn), eftersom dessa är tänkta att definieras i "
+"ett annat objekt.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -6687,7 +6728,7 @@ msgstr "Botswana"
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr "Partnertitlar"
+msgstr "Företagstitlar"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -6697,7 +6738,7 @@ msgstr "Lägg till autouppdatering till vyn."
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr "Markera denna om partnern är en anställd."
+msgstr "Markera denna om företaget också är en anställd."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
@@ -7483,7 +7524,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Firm"
-msgstr ""
+msgstr "Företagsform"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -7949,6 +7990,24 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Denna modul kan automatiskt skapa projektaktiviteter baserat på inkommande e-"
+"post\n"
+"===================================================================\n"
+"\n"
+"Tillåter dig att skapa uppgifter baserat på nya e-postmeddelanden som kommer "
+"till en viss brevlåda,\n"
+"likhet med vad CRM programmet har för kundämnen / affärsmöjligheter.\n"
+"Det finns två vanliga alternativ för att konfigurera brevlådeintegrationen:\n"
+"\n"
+"* Installera `` fetchmail `` modul och konfigurera en ny brevlåda, välj "
+"sedan\n"
+"`` Projektaktiviteter `` som mål för inkommande e-post.\n"
+"* Ställ in det manuellt på e-postservern baserat på \"post-gateway\" script\n"
+"ges i `` mail `` modul - och anslut den till `project.task` modell.\n"
+"\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_membership
@@ -9507,7 +9566,7 @@ msgstr "Användargränssnitt"
 #: field:res.partner,child_ids:0
 #: field:res.request,ref_partner_id:0
 msgid "Partner Ref."
-msgstr "Partnerref."
+msgstr "Företagsreferense"
 
 #. module: base
 #: field:ir.attachment,create_date:0
@@ -10863,8 +10922,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
-"Hantera titlarna på systemets partner, som avspeglar deras legala status: "
-"AB, kommun, stiftelse etc."
+"Hantera systemets företagsformer, som avspeglar deras legala status: AB, "
+"kommun, stiftelse etc."
 
 #. module: base
 #: view:base.language.export:0
@@ -11608,7 +11667,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
 msgid "OpenERP Partners"
-msgstr "OpenERP Partners"
+msgstr "OpenERP-partner"
 
 #. module: base
 #: code:addons/base/module/module.py:293
@@ -12359,7 +12418,7 @@ msgstr "Guldpartner"
 #: selection:res.partner.title,domain:0
 #: model:res.request.link,name:base.req_link_partner
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: base
 #: field:ir.model.fields,complete_name:0
@@ -12734,7 +12793,7 @@ msgstr "Villkor"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr "Övriga partners"
+msgstr "Övriga företag"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
@@ -13066,7 +13125,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr "Partnerkategori"
+msgstr "Företagskategori"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -14300,7 +14359,7 @@ msgstr "Källa"
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
 msgstr ""
-"Lämna blank om det är en privat adress som inte ska kopplas till en partner."
+"Lämna blank om det är en privatadress som inte ska kopplas till ett företag."
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -14411,8 +14470,8 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
-"Markera den här rutan om partnern är en leverantör. Om den inte är markerar "
-"så kommer partnern inte visas när man väljer leverantör på en inköpsorder."
+"Markera den här rutan om företaget är en leverantör. Om den inte är markerar "
+"så kommer företaget inte visas när man väljer leverantör på en inköpsorder."
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14584,7 +14643,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "Leads & Opportunities"
+msgstr "Kundämnen och affärsmöjligheter"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -15090,6 +15149,10 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"Hantera företagskategorier för att bättre klassificera dem för spårning och "
+"analyssyften. Ett företag kan tillhöra flera kategorier och kategorier har "
+"en hierarkisk struktur: en företag som tillhör en kategori hör också till "
+"överordnade kategorin."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -15194,6 +15257,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Du kan komma åt all information om dina leverantörer från "
+"leverantörsformuläret: redovisningsdata, historik av e-post, möten, inköp "
+"etc. Du kan avmarkera  leverantörsfilterknappen för att söka i alla dina "
+"företag, däribland kunder och kundämnen."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -15626,7 +15693,7 @@ msgstr "Mobilnr"
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr "Partnerkategorier"
+msgstr "Företagskategorier"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -15769,7 +15836,7 @@ msgstr "Arbetsflödeinstanser"
 #: code:addons/base/res/res_partner.py:284
 #, python-format
 msgid "Partners: "
-msgstr "Partners "
+msgstr "Företag: "
 
 #. module: base
 #: field:res.partner.bank,name:0
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 3e6b0a379cf..df20f7a2adc 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 78f0877d2a2..805035cf850 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,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-07-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15593)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index c1823796f8b..b6670894b5c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,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-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index ba2f93242dd..79d5db6ef59 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:43+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 9ecaa19aeb9..4239bc2adf3 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 742c4aedd8a..0255aaf2f57 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index bc0591e9c93..ee0f43d8372 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index d86d8de9592..96313cd3e58 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.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-07-05 04:47+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:44+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 72f0f0a0faf..a4804f29e56 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,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-07-05 04:48+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:45+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. module: base
 #: model:res.country,name:base.sh

From b8129fc2de94f4d469671cef00e712e682d118b0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Jul 2012 04:53:54 +0000
Subject: [PATCH 328/397] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120719044629-d54b2fz9zz2brmfa
bzr revid: launchpad_translations_on_behalf_of_openerp-20120719045354-dkjm64h7hz2zhqqg
---
 addons/crm_todo/i18n/en_GB.po   |   95 +++
 addons/event/i18n/mn.po         | 1263 +++++++++++++++++++++++++++++++
 addons/web/i18n/ja.po           |  834 ++++++++++----------
 addons/web_calendar/i18n/ja.po  |  138 ++--
 addons/web_dashboard/i18n/ja.po |   24 +-
 addons/web_diagram/i18n/ja.po   |   25 +-
 addons/web_gantt/i18n/ja.po     |   10 +-
 addons/web_graph/i18n/ja.po     |   40 +-
 addons/web_kanban/i18n/ja.po    |   28 +-
 addons/web_mobile/i18n/ja.po    |   14 +-
 addons/web_process/i18n/ja.po   |   24 +-
 11 files changed, 1937 insertions(+), 558 deletions(-)
 create mode 100644 addons/crm_todo/i18n/en_GB.po
 create mode 100644 addons/event/i18n/mn.po

diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po
new file mode 100644
index 00000000000..d0d736b83ae
--- /dev/null
+++ b/addons/crm_todo/i18n/en_GB.po
@@ -0,0 +1,95 @@
+# English (United Kingdom) 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-18 16:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@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-07-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Task"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Timebox"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "For cancelling the task"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Error ! Task end-date must be greater then task start-date"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Next"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "My Tasks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Tasks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Done"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Error ! You cannot create recursive tasks."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Extra Info"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Lead / Opportunity"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "For changing to done state"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Previous"
diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po
new file mode 100644
index 00000000000..8e47ece549f
--- /dev/null
+++ b/addons/event/i18n/mn.po
@@ -0,0 +1,1263 @@
+# Mongolian 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-18 08:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-07-19 04:46+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Нэхэмжлэлийн мэдээлэл"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr ""
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr ""
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Бүртгүүлсэн е-майл"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "Бүртгүүлсэн огноо"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Invoiced Registrations only"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Батлагдсан е-майл"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr ""
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:88
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr "Бүртгэгдсэн үйл ажиллагаа"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr ""
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmed events"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event Beginning Date"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "Үйл ажиллагааны анализ"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:125
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+msgid "Event Dashboard"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrations"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want to use automatic confirmation emailing or "
+"reminder."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Events in New state"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Confirm"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr ""
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Provide Minimum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "New"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr ""
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confirmed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:398
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:399
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in last month"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current year"
+msgstr ""
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Confirmed registrations"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_confirm_registration.py:54
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr ""
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who will be giving speech at the event."
+msgstr ""
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"If event is created, the state is 'Draft'.If event is confirmed for the "
+"particular dates the state is set to 'Confirmed'. If the event is over, the "
+"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_reg
+#: view:report.event.registration:0
+msgid "Events Filling Status"
+msgstr ""
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events States"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximum Number of Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr ""
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Registrations in unconfirmed state"
+msgstr ""
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr ""
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:361
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in New state"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr ""
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr ""
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: event
+#: help:event.event,product_id:0
+msgid ""
+"The invoices of this event registration will be created with this Product. "
+"Thus it allows you to set the default label and the accounting info you want "
+"by default on these invoices."
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr ""
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+msgid ""
+"Warning: This Event has not reached its Minimum Registration Limit. Are you "
+"sure you want to confirm it?"
+msgstr ""
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr ""
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:499
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Registrations in confirmed or done state"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:446
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:465
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:436
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:561
+#: code:addons/event/event.py:568
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current month"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use automatic emailing for new registration."
+msgstr ""
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr ""
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Events Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr ""
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr ""
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:565
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:527
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr ""
+
+#. module: event
+#: help:event.event,unit_price:0
+msgid ""
+"This will be the default price used as registration cost when invoicing this "
+"event. Note that you can specify a specific amount for each registration."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in confirm state"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,id:0
+msgid "ID"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:51
+#, python-format
+msgid "Invoice cannot be created if the registration is in %s state."
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: model:ir.actions.act_window,name:event.action_event_confirm
+#: model:ir.model,name:event.model_event_confirm
+msgid "Event Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr ""
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"should be synchronized with mobile devices or calendar applications through "
+"caldav. Most of the users should work in the Calendar menu, and not in the "
+"list of events."
+msgstr ""
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 66f1f5d584b..c1339863a4d 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -8,179 +8,183 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-31 18:44+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:18+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:54+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:170
-#: addons/web/static/src/js/chrome.js:196
-#: addons/web/static/src/js/chrome.js:364
-#: addons/web/static/src/js/view_form.js:531
-#: addons/web/static/src/js/view_form.js:1665
-#: addons/web/static/src/xml/base.xml:1641
+#: addons/web/static/src/js/chrome.js:176
+#: addons/web/static/src/js/chrome.js:202
+#: addons/web/static/src/js/chrome.js:380
+#: addons/web/static/src/js/view_form.js:457
+#: addons/web/static/src/js/view_form.js:1292
+#: addons/web/static/src/xml/base.xml:1701
 msgid "Ok"
-msgstr "正常"
+msgstr "OK"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:178
+#: addons/web/static/src/js/chrome.js:184
 msgid "Send OpenERP Enterprise Report"
 msgstr "OpenERPエンタープライズレポートを送る"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:192
+#: addons/web/static/src/js/chrome.js:198
 msgid "Dont send"
 msgstr "送らない"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:212
-#: addons/web/static/src/js/chrome.js:914
+#: addons/web/static/src/js/chrome.js:1119
 msgid "Client Error"
 msgstr "クライアントのエラー"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:253
+#: addons/web/static/src/js/chrome.js:260
 #, python-format
 msgid "Loading (%d)"
 msgstr "ロード中 (%d)"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:276
+#: addons/web/static/src/js/chrome.js:292
 msgid "Invalid database name"
 msgstr "無効なデータベース名"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:455
 msgid "Backed"
 msgstr "バックアップされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:402
+#: addons/web/static/src/js/chrome.js:456
 msgid "Database backed up successfully"
 msgstr "データベースは正常にバックアップされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Restored"
 msgstr "リストアされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:442
+#: addons/web/static/src/js/chrome.js:499
 msgid "Database restored successfully"
 msgstr "データベースは正常にリストアされました"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:735
-#: addons/web/static/src/xml/base.xml:259
-#: addons/web/static/src/xml/base.xml:367
+#: addons/web/static/src/js/chrome.js:783
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1735
 msgid "Change Password"
 msgstr "パスワードの変更"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:809
-#: addons/web/static/src/xml/base.xml:326
+#: addons/web/static/src/js/chrome.js:759
+#: addons/web/static/src/xml/base.xml:356
 msgid "Preferences"
 msgstr "個人設定"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:812
+#: addons/web/static/src/js/chrome.js:763
 msgid "Change password"
 msgstr "パスワードの変更"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:813
-#: addons/web/static/src/js/view_editor.js:96
-#: addons/web/static/src/js/view_editor.js:832
-#: addons/web/static/src/js/view_editor.js:960
-#: addons/web/static/src/js/view_form.js:1660
-#: addons/web/static/src/xml/base.xml:1468
-#: addons/web/static/src/xml/base.xml:1478
+#: addons/web/static/src/js/chrome.js:762
+#: addons/web/static/src/js/search.js:241
+#: addons/web/static/src/js/search.js:300
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1287
+#: addons/web/static/src/xml/base.xml:743
+#: addons/web/static/src/xml/base.xml:1502
+#: addons/web/static/src/xml/base.xml:1512
+#: addons/web/static/src/xml/base.xml:1521
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:814
-#: addons/web/static/src/js/view_editor.js:74
-#: addons/web/static/src/js/views.js:899 addons/web/static/src/xml/base.xml:687
-#: addons/web/static/src/xml/base.xml:1384
-#: addons/web/static/src/xml/base.xml:1472
+#: addons/web/static/src/js/chrome.js:764
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:967 addons/web/static/src/xml/base.xml:742
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1520
 msgid "Save"
 msgstr "保存"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:839
+#: addons/web/static/src/js/chrome.js:680
+#: addons/web/static/src/xml/base.xml:359
 msgid "About"
 msgstr "について"
 
 #. openerp-web
-#: addons/web/static/src/js/chrome.js:856
+#: addons/web/static/src/js/chrome.js:1052
 msgid "OpenERP - Unsupported/Community Version"
 msgstr "OpenERP - サポート無し/コミュニティバージョン"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:619
 msgid "less than a minute ago"
-msgstr ""
+msgstr "数十秒前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:620
 msgid "about a minute ago"
-msgstr ""
+msgstr "1分前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d分前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:622
 msgid "about an hour ago"
-msgstr ""
+msgstr "1時間前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:623
 #, python-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d時間前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:624
 msgid "a day ago"
-msgstr ""
+msgstr "1日前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d 日前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:626
 msgid "about a month ago"
-msgstr ""
+msgstr "1ヶ月前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:627
 #, python-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%dヶ月前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:628
 msgid "about a year ago"
-msgstr ""
+msgstr "1年前"
 
 #. openerp-web
 #: addons/web/static/src/js/coresetup.js:629
 #, python-format
 msgid "%d years ago"
-msgstr ""
+msgstr "%d年前"
 
 #. openerp-web
 #: addons/web/static/src/js/data_export.js:6
@@ -191,10 +195,10 @@ msgstr "データのエクスポート"
 #: addons/web/static/src/js/data_export.js:19
 #: addons/web/static/src/js/data_import.js:70
 #: addons/web/static/src/js/view_editor.js:49
-#: addons/web/static/src/js/view_editor.js:399
-#: addons/web/static/src/js/view_form.js:891
-#: addons/web/static/src/js/view_form.js:3901
-#: addons/web/static/src/js/views.js:900
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:734
+#: addons/web/static/src/js/view_form.js:3298
+#: addons/web/static/src/js/views.js:968
 msgid "Close"
 msgstr "閉じる"
 
@@ -204,19 +208,19 @@ msgid "Export To File"
 msgstr "ファイルにエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:125
+#: addons/web/static/src/js/data_export.js:126
 msgid "Please enter save field list name"
-msgstr "保管するフィールドリスト名を入れてください"
+msgstr "保管する項目リスト名を入れてください"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:360
+#: addons/web/static/src/js/data_export.js:362
 msgid "Please select fields to save export list..."
-msgstr "エクスポートリストに保管するフィールドを選んでください"
+msgstr "エクスポートリストに保存する項目を選んでください"
 
 #. openerp-web
-#: addons/web/static/src/js/data_export.js:373
+#: addons/web/static/src/js/data_export.js:375
 msgid "Please select fields to export..."
-msgstr "エクスポートするフィールドを選んでください"
+msgstr "エクスポートする項目を選んでください"
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:34
@@ -238,93 +242,93 @@ msgstr "外部ID"
 msgid ""
 "Destination fields should only be selected once, some fields are selected "
 "more than once:"
-msgstr ""
+msgstr "宛先項目の選択は1回のみです。幾つかの項目は複数回選択されます："
 
 #. openerp-web
 #: addons/web/static/src/js/data_import.js:383
 msgid "*Required Fields are not selected :"
-msgstr ""
+msgstr "* 必須項目が選択されていません："
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:141
+#: addons/web/static/src/js/formats.js:139
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "（%d レコード）"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:327
-#: addons/web/static/src/js/view_form.js:4301
+#: addons/web/static/src/js/formats.js:325
+#: addons/web/static/src/js/view_page.js:268
 msgid "Download"
 msgstr "ダウンロード"
 
 #. openerp-web
-#: addons/web/static/src/js/formats.js:332
+#: addons/web/static/src/js/formats.js:330
 #, python-format
 msgid "Download \"%s\""
-msgstr "ダウンロード \"%s\""
+msgstr "%s のダウンロード"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "Invalid Search"
 msgstr "無効な検索"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:798
+#: addons/web/static/src/js/search.js:437
 msgid "triggered from search view"
 msgstr "検索ビューによって起動"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:528
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
-msgstr "フィールド  %(fieldname)s の正しくない値： [%(value)s] は %(message)s"
+msgstr "項目 %(fieldname)s の誤った値： [%(value)s] は %(message)s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:948
 #, python-format
 msgid "Filter on: %s"
-msgstr ""
+msgstr "フィルタ：%s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:999
 msgid "Filter"
-msgstr ""
+msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1108
 #, python-format
 msgid "Group by: %s"
-msgstr ""
+msgstr "グループ：%s"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1132
 msgid "GroupBy"
-msgstr ""
+msgstr "グループ化"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1267
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "%(field)s を検索：%(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:869
 msgid "not a valid integer"
 msgstr "正しいトリガーではありません"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:883
 msgid "not a valid number"
 msgstr "正しい数値ではありません"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1398
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/js/search.js:962
+#: addons/web/static/src/xml/base.xml:973
 msgid "Yes"
 msgstr "はい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1399
+#: addons/web/static/src/js/search.js:963
 msgid "No"
 msgstr "いいえ"
 
@@ -332,18 +336,17 @@ msgstr "いいえ"
 #: addons/web/static/src/js/search.js:1416
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "%(field)s の検索：%(value)s"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1622
-#: addons/web/static/src/xml/base.xml:1229
+#: addons/web/static/src/xml/base.xml:1286
 msgid "Filters"
 msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1762
 msgid "Advanced"
-msgstr ""
+msgstr "高度"
 
 #. openerp-web
 #: addons/web/static/src/js/search.js:1853
@@ -352,77 +355,87 @@ msgid "%(field)s %(operator)s \"%(value)s\""
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1888
+#: addons/web/static/src/js/search.js:1341
 msgid "contains"
-msgstr "次を含む"
+msgstr "含む"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1889
+#: addons/web/static/src/js/search.js:1342
 msgid "doesn't contain"
 msgstr "含まない"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1890
-#: addons/web/static/src/js/search.js:1900
-#: addons/web/static/src/js/search.js:1928
-#: addons/web/static/src/js/search.js:1952
+#: addons/web/static/src/js/search.js:1343
+#: addons/web/static/src/js/search.js:1359
+#: addons/web/static/src/js/search.js:1380
+#: addons/web/static/src/js/search.js:1401
+#: addons/web/static/src/js/search.js:1424
 msgid "is equal to"
 msgstr "は次と一致する"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1891
-#: addons/web/static/src/js/search.js:1901
-#: addons/web/static/src/js/search.js:1929
-#: addons/web/static/src/js/search.js:1953
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1381
+#: addons/web/static/src/js/search.js:1402
+#: addons/web/static/src/js/search.js:1425
 msgid "is not equal to"
 msgstr "は次と一致しない"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1902
-#: addons/web/static/src/js/search.js:1930
-#: addons/web/static/src/js/search.js:1954
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1361
+#: addons/web/static/src/js/search.js:1382
+#: addons/web/static/src/js/search.js:1403
+#: addons/web/static/src/js/search.js:1426
 msgid "greater than"
 msgstr "次より大きい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1903
-#: addons/web/static/src/js/search.js:1931
-#: addons/web/static/src/js/search.js:1955
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1362
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1404
+#: addons/web/static/src/js/search.js:1427
 msgid "less than"
 msgstr "次より小さい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1904
-#: addons/web/static/src/js/search.js:1932
-#: addons/web/static/src/js/search.js:1956
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1363
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1405
+#: addons/web/static/src/js/search.js:1428
 msgid "greater or equal than"
 msgstr "次より大きいか等しい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1905
-#: addons/web/static/src/js/search.js:1933
-#: addons/web/static/src/js/search.js:1957
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1364
+#: addons/web/static/src/js/search.js:1385
+#: addons/web/static/src/js/search.js:1406
+#: addons/web/static/src/js/search.js:1429
 msgid "less or equal than"
 msgstr "次より小さいか等しい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1947
-#: addons/web/static/src/js/search.js:1973
+#: addons/web/static/src/js/search.js:1419
+#: addons/web/static/src/js/search.js:1444
 msgid "is"
 msgstr "が次である"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1974
+#: addons/web/static/src/js/search.js:1445
 msgid "is not"
 msgstr "は次ではない"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1988
+#: addons/web/static/src/js/search.js:1459
 msgid "is true"
 msgstr "は正しい"
 
 #. openerp-web
-#: addons/web/static/src/js/search.js:1989
+#: addons/web/static/src/js/search.js:1460
 msgid "is false"
 msgstr "は正しくない"
 
@@ -435,195 +448,194 @@ msgstr "管理ビュー (%s)"
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:46
 #: addons/web/static/src/js/view_list.js:17
-#: addons/web/static/src/xml/base.xml:121
-#: addons/web/static/src/xml/base.xml:164
-#: addons/web/static/src/xml/base.xml:684
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:761
 msgid "Create"
 msgstr "作成"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:47
-#: addons/web/static/src/xml/base.xml:456
-#: addons/web/static/src/xml/base.xml:683
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:760
 msgid "Edit"
 msgstr "編集"
 
 #. openerp-web
 #: addons/web/static/src/js/view_editor.js:48
-#: addons/web/static/src/xml/base.xml:1595
+#: addons/web/static/src/xml/base.xml:1653
 msgid "Remove"
 msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:72
+#: addons/web/static/src/js/view_editor.js:71
 #, python-format
 msgid "Create a view (%s)"
 msgstr "ビュー (%s) を作成"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:169
+#: addons/web/static/src/js/view_editor.js:168
 msgid "Do you really want to remove this view?"
 msgstr "このビューを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:365
+#: addons/web/static/src/js/view_editor.js:364
 #, python-format
 msgid "View Editor %d - %s"
 msgstr "ビューエディタ %d - %s"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:368
+#: addons/web/static/src/js/view_editor.js:367
 msgid "Inherited View"
 msgstr "継承ビュー"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:372
+#: addons/web/static/src/js/view_editor.js:371
 msgid "Do you really wants to create an inherited view here?"
 msgstr "継承ビューを作成しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:382
+#: addons/web/static/src/js/view_editor.js:381
 msgid "Preview"
 msgstr "プレビュー"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:502
+#: addons/web/static/src/js/view_editor.js:501
 msgid "Do you really want to remove this node?"
 msgstr "このノードを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:811
-#: addons/web/static/src/js/view_editor.js:937
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
 msgid "Properties"
 msgstr "属性"
 
 #. openerp-web
-#: addons/web/static/src/js/view_editor.js:814
-#: addons/web/static/src/js/view_editor.js:940
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
 msgid "Update"
 msgstr "更新"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:43
+#: addons/web/static/src/js/view_form.js:16
+#: addons/web/static/src/js/view_form.js:210
 msgid "Form"
 msgstr "フォーム"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:147
-#: addons/web/static/src/js/view_list.js:358
-#: addons/web/static/src/xml/base.xml:1653
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:763
+#: addons/web/static/src/xml/base.xml:1714
 msgid "Delete"
 msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:148
+#: addons/web/static/src/xml/base.xml:762
 msgid "Duplicate"
-msgstr "重複"
+msgstr "複製"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:149
-#: addons/web/static/src/js/view_form.js:885
+#: addons/web/static/src/js/view_form.js:133
+#: addons/web/static/src/js/view_form.js:728
 msgid "Set Default"
 msgstr "デフォルトに設定"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:643
+#: addons/web/static/src/js/view_page.js:59
 msgid "Do you really want to delete this record?"
 msgstr "このレコードを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:657
+#: addons/web/static/src/js/view_form.js:508
 msgid ""
 "Warning, the record has been modified, your changes will be discarded."
-msgstr "警告，レコードは変更されて，あなたが行った変更は無視されます"
+msgstr "警告，レコードは変更されて，あなたが行った変更は無視されます。"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:892
+#: addons/web/static/src/js/view_form.js:735
 msgid "Save default"
-msgstr "デフォルトを保管"
+msgstr "デフォルトに保存"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1402
+#: addons/web/static/src/js/view_form.js:867
 #, python-format
 msgid "Unknown operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1410
+#: addons/web/static/src/js/view_form.js:875
 #, python-format
 msgid "Unknown field %s in domain %s"
-msgstr "ドメイン  %s に無効なフィールド  %s があります"
+msgstr "ドメイン  %s に無効な項目  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1448
+#: addons/web/static/src/js/view_form.js:913
 #, python-format
 msgid "Unsupported operator %s in domain %s"
 msgstr "ドメイン  %s に無効な演算  %s があります"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:1657
+#: addons/web/static/src/js/view_form.js:1284
 msgid "Confirm"
 msgstr "確認"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2478
+#: addons/web/static/src/js/view_form.js:2193
 msgid "<em>   Search More...</em>"
-msgstr "<em>   もっと検索…</em>"
+msgstr "<em>   さらに検索…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2488
+#: addons/web/static/src/js/view_form.js:2211
 #, python-format
 msgid "<em>   Create \"<strong>%s</strong>\"</em>"
 msgstr "<em>   作成 \"<strong>%s</strong>\"</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2494
+#: addons/web/static/src/js/view_form.js:2217
 msgid "<em>   Create and Edit...</em>"
-msgstr "<em>   作成して編集…</em>"
+msgstr "<em>   作成＆編集…</em>"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/views.js:680
 msgid "Search: "
 msgstr "検索: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2527
-#: addons/web/static/src/js/view_form.js:3210
+#: addons/web/static/src/js/view_form.js:2250
+#: addons/web/static/src/js/view_form.js:2738
 msgid "Create: "
 msgstr "作成: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:2596
-#: addons/web/static/src/js/view_form.js:3125
-#: addons/web/static/src/js/view_form.js:3238
-#: addons/web/static/src/js/view_form.js:3586
-#: addons/web/static/src/js/view_form.js:3702
+#: addons/web/static/src/js/view_form.js:2040
+#: addons/web/static/src/js/view_form.js:2766
+#: addons/web/static/src/js/view_form.js:2991
 msgid "Open: "
 msgstr "開く: "
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3517
-#: addons/web/static/src/js/view_form.js:3644
-#: addons/web/static/src/xml/base.xml:1184
-#: addons/web/static/src/xml/base.xml:1594
+#: addons/web/static/src/js/view_form.js:2911
+#: addons/web/static/src/xml/base.xml:755
+#: addons/web/static/src/xml/base.xml:777
+#: addons/web/static/src/xml/base.xml:1652
 msgid "Add"
 msgstr "追加"
 
 #. openerp-web
-#: addons/web/static/src/js/view_form.js:3566
-#: addons/web/static/src/js/view_form.js:3684
+#: addons/web/static/src/js/view_form.js:2971
 msgid "Add: "
 msgstr "追加: "
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "Save As..."
-msgstr ""
+msgstr "名前を付けて保存"
 
 #. openerp-web
 #: addons/web/static/src/js/view_form.js:4230
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "項目は空です。何も保存するものはありません。"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:8
@@ -631,54 +643,52 @@ msgid "List"
 msgstr "リスト"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:338
+#: addons/web/static/src/js/view_list.js:277
 msgid "Unlimited"
 msgstr "制限なし"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:356
-#: addons/web/static/src/xml/base.xml:622
-#: addons/web/static/src/xml/base.xml:1657
+#: addons/web/static/src/js/views.js:819
+#: addons/web/static/src/xml/base.xml:1742
 msgid "Import"
 msgstr "インポート"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:357
-#: addons/web/static/src/xml/base.xml:1554
+#: addons/web/static/src/js/views.js:822
+#: addons/web/static/src/xml/base.xml:1612
 msgid "Export"
 msgstr "エクスポート"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:436
+#: addons/web/static/src/js/view_list.js:374
 msgid "Group"
-msgstr ""
+msgstr "グループ"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:623
+#: addons/web/static/src/js/view_list.js:549
 msgid "Do you really want to remove these records?"
 msgstr "このレコードを削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:716
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:925
 msgid "Warning"
 msgstr "注意"
 
 #. openerp-web
 #: addons/web/static/src/js/view_list.js:716
 msgid "You must select at least one record."
-msgstr ""
+msgstr "最低限1レコード選択して下さい。"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1332
+#: addons/web/static/src/js/view_list.js:1243
 msgid "Undefined"
 msgstr "未定義"
 
 #. openerp-web
-#: addons/web/static/src/js/view_list.js:1428
+#: addons/web/static/src/js/view_list.js:1342
 #, python-format
 msgid "%(page)d/%(page_count)d"
-msgstr "%(page)d/%(page_count)d"
+msgstr "%(page)d / %(page_count)d"
 
 #. openerp-web
 #: addons/web/static/src/js/view_tree.js:11
@@ -686,336 +696,337 @@ msgid "Tree"
 msgstr "ツリー"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:566 addons/web/static/src/xml/base.xml:452
+#: addons/web/static/src/js/views.js:570 addons/web/static/src/xml/base.xml:480
 msgid "Fields View Get"
-msgstr "フィールドのビューを得る"
+msgstr "項目ビューの取得"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:574
+#: addons/web/static/src/js/views.js:578
 #, python-format
 msgid "View Log (%s)"
 msgstr "ビューのログ (%s)"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:604
+#: addons/web/static/src/js/views.js:605
 #, python-format
 msgid "Model %s fields"
-msgstr "モデル %s フィールド"
+msgstr "モデル %s 項目"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:614 addons/web/static/src/xml/base.xml:455
+#: addons/web/static/src/js/views.js:615 addons/web/static/src/xml/base.xml:482
 msgid "Manage Views"
 msgstr "ビューの管理"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:615
+#: addons/web/static/src/js/views.js:616
 msgid "Could not find current view declaration"
 msgstr "このビューの定義が見つかりません"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:716
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:717
 msgid "Attachment"
-msgstr ""
+msgstr "添付"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276
 msgid "More"
-msgstr ""
+msgstr "さらに"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:810
 msgid "Translate"
 msgstr "翻訳"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:726
+#: addons/web/static/src/js/views.js:812
 msgid "Technical translation"
 msgstr "技術翻訳"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:820
+#: addons/web/static/src/js/views.js:924
 msgid "You must choose at least one record."
-msgstr "少なくとも１つのレコードを選んでください"
+msgstr "少なくとも１つのレコードを選んで下さい。"
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:875
 msgid "Uploading..."
-msgstr ""
+msgstr "アップロード中..."
 
 #. openerp-web
 #: addons/web/static/src/js/views.js:885
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "この添付を本当に削除しますか？"
 
 #. openerp-web
-#: addons/web/static/src/js/views.js:894
+#: addons/web/static/src/js/views.js:962
 msgid "Translations"
 msgstr "翻訳"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:9
+#: addons/web/static/src/xml/base.xml:52
 msgid "Loading..."
 msgstr "読込み中..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid ""
 "Your version of OpenERP is unsupported. Support & maintenance services are "
 "available here:"
-msgstr "このOpenERPはサポートされていあせん。サポート保守サービスはこちらまで："
+msgstr "このOpenERPのバージョンはサポートされていません。サポート保守サービスはこちらから："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:48
+#: addons/web/static/src/xml/base.xml:251
 msgid "OpenERP Entreprise"
 msgstr "OpenERPエンタープライズ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:53
+#: addons/web/static/src/xml/base.xml:256
 msgid "OpenERP Enterprise Contract."
 msgstr "OpenERPエンタープライズ契約"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:54
+#: addons/web/static/src/xml/base.xml:257
 msgid "Your report will be sent to the OpenERP Enterprise team."
-msgstr "あなたのレポートをOpenERPエンタープライズチームに送ります"
+msgstr "あなたのレポートをOpenERPエンタープライズチームに送ります。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:56
+#: addons/web/static/src/xml/base.xml:259
 msgid "Summary:"
-msgstr "要約:"
+msgstr "要約："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:60
+#: addons/web/static/src/xml/base.xml:263
 msgid "Description:"
-msgstr "説明:"
+msgstr "説明："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:64
+#: addons/web/static/src/xml/base.xml:267
 msgid "What you did:"
 msgstr "あなたが行ったこと："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:80
+#: addons/web/static/src/xml/base.xml:297
 msgid "Invalid username or password"
 msgstr "ユーザ名またはパスワードが間違っています"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:84 addons/web/static/src/xml/base.xml:174
-#: addons/web/static/src/xml/base.xml:200
+#: 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 "データベース:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:89
+#: addons/web/static/src/xml/base.xml:306
 msgid "Username"
 msgstr "ユーザ名"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:91 addons/web/static/src/xml/base.xml:125
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
 msgid "Password"
 msgstr "パスワード"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:93
+#: addons/web/static/src/xml/base.xml:310
 msgid "Log in"
 msgstr "ログイン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:97
+#: addons/web/static/src/xml/base.xml:314
 msgid "Manage Databases"
 msgstr "データベースの管理"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:389
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
 msgid "Powered by"
 msgstr "で動く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:98 addons/web/static/src/xml/base.xml:334
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1819
 msgid "OpenERP"
 msgstr "OpenERP"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:122
-#: addons/web/static/src/xml/base.xml:189
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
 msgid "Drop"
-msgstr "破棄"
+msgstr "削除"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:123
-#: addons/web/static/src/xml/base.xml:215
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
 msgid "Backup"
 msgstr "バックアップ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:124
-#: addons/web/static/src/xml/base.xml:237
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
 msgid "Restore"
 msgstr "リストア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:126
+#: addons/web/static/src/xml/base.xml:332
 msgid "Back to Login"
 msgstr "ログインへ戻る"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:131
+#: addons/web/static/src/xml/base.xml:61
 msgid "CREATE DATABASE"
 msgstr "データベース作成"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:134
-#: addons/web/static/src/xml/base.xml:247
+#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
 msgid "Master password:"
 msgstr "マスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:138
-#: addons/web/static/src/xml/base.xml:233
+#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
 msgid "New database name:"
 msgstr "新しいデータベース名："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:142
+#: addons/web/static/src/xml/base.xml:77
 msgid "Load Demonstration data:"
 msgstr "デモ用のデータを読込み中："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:146
+#: addons/web/static/src/xml/base.xml:81
 msgid "Default language:"
 msgstr "デフォルトの言語:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:156
+#: addons/web/static/src/xml/base.xml:91
 msgid "Admin password:"
 msgstr "アドミン用パスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:160
+#: addons/web/static/src/xml/base.xml:95
 msgid "Confirm password:"
 msgstr "パスワード確認"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:171
+#: addons/web/static/src/xml/base.xml:109
 msgid "DROP DATABASE"
-msgstr "データベースを破棄"
+msgstr "データベースを削除"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:185
-#: addons/web/static/src/xml/base.xml:211
-#: addons/web/static/src/xml/base.xml:229
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
 msgid "Master Password:"
 msgstr "マスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:197
+#: addons/web/static/src/xml/base.xml:143
 msgid "BACKUP DATABASE"
 msgstr "データベースをバックアップ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:222
+#: addons/web/static/src/xml/base.xml:175
 msgid "RESTORE DATABASE"
 msgstr "データベースをリストア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:225
+#: addons/web/static/src/xml/base.xml:182
 msgid "File:"
 msgstr "ファイル:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:244
+#: addons/web/static/src/xml/base.xml:204
 msgid "CHANGE MASTER PASSWORD"
 msgstr "マスタパスワードの変更"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:251
+#: addons/web/static/src/xml/base.xml:216
 msgid "New master password:"
 msgstr "新しいマスタパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:255
+#: addons/web/static/src/xml/base.xml:221
 msgid "Confirm new master password:"
 msgstr "新しいマスタパスワードの確認："
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:325
 msgid "About OpenERP"
-msgstr ""
+msgstr "OpenERPについて"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:327
 msgid "Log out"
-msgstr ""
+msgstr "ログアウト"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:333
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "開発者モードを有効化"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:335
+#: addons/web/static/src/xml/base.xml:1820
 msgid "Version"
 msgstr "バージョン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:336
+#: addons/web/static/src/xml/base.xml:1821
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 msgstr "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:337
+#: addons/web/static/src/xml/base.xml:1822
 msgid "OpenERP is a trademark of the"
 msgstr "OpenERPは商標です"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:338
+#: addons/web/static/src/xml/base.xml:1823
 msgid "OpenERP SA Company"
 msgstr "OpenERP SA Company"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:340
+#: addons/web/static/src/xml/base.xml:1825
 msgid "Licenced under the terms of"
 msgstr "ライセンスに準拠"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:341
+#: addons/web/static/src/xml/base.xml:1826
 msgid "GNU Affero General Public License"
 msgstr "GNU Affero General Public License"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:343
+#: addons/web/static/src/xml/base.xml:1828
 msgid "For more information visit"
 msgstr "もっと詳しい情報はこちらへ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:344
+#: addons/web/static/src/xml/base.xml:1829
 msgid "OpenERP.com"
 msgstr "OpenERP.com"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:352
+#: addons/web/static/src/xml/base.xml:1720
 msgid "Old Password:"
 msgstr "古いパスワード"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:357
+#: addons/web/static/src/xml/base.xml:1725
 msgid "New Password:"
 msgstr "新しいパスワード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:362
+#: addons/web/static/src/xml/base.xml:1730
 msgid "Confirm Password:"
 msgstr "パスワードの確認:"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:390
@@ -1023,85 +1034,84 @@ msgid "ERP"
 msgstr ""
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:448
+#: addons/web/static/src/xml/base.xml:477
 msgid "Debug View#"
-msgstr "ビュー＃をデバッグ"
+msgstr "ビューをデバッグ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:449
+#: addons/web/static/src/xml/base.xml:478
 msgid "View Log (perm_read)"
 msgstr "ログ (perm_read) のビュー"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:450
 msgid "Toggle Form Layout Outline"
-msgstr ""
+msgstr "トグル形式のレイアウトの概観"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:451
+#: addons/web/static/src/xml/base.xml:479
 msgid "View Fields"
-msgstr "フィールドのビュー"
+msgstr "項目のビュー"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:453
-#: addons/web/static/src/xml/base.xml:1242
+#: addons/web/static/src/xml/base.xml:1300
 msgid "Manage Filters"
 msgstr "フィルタの管理"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:456
+#: addons/web/static/src/xml/base.xml:483
 msgid "View"
 msgstr "ビュー"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:457
+#: addons/web/static/src/xml/base.xml:484
 msgid "Edit SearchView"
-msgstr "サーチビューを編集"
+msgstr "検索ビューの編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:458
+#: addons/web/static/src/xml/base.xml:485
 msgid "Edit Action"
-msgstr "アクションを編集"
+msgstr "アクションの編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:459
+#: addons/web/static/src/xml/base.xml:486
 msgid "Edit Workflow"
 msgstr "ワークフローを編集"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:464
+#: addons/web/static/src/xml/base.xml:491
 msgid "ID:"
-msgstr "ID:"
+msgstr "ID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:467
+#: addons/web/static/src/xml/base.xml:494
 msgid "XML ID:"
 msgstr "XML ID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:470
+#: addons/web/static/src/xml/base.xml:497
 msgid "Creation User:"
 msgstr "ユーザの作成："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:473
+#: addons/web/static/src/xml/base.xml:500
 msgid "Creation Date:"
 msgstr "日付の作成："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:476
+#: addons/web/static/src/xml/base.xml:503
 msgid "Latest Modification by:"
-msgstr "最近の修正は："
+msgstr "最終更新者："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:479
+#: addons/web/static/src/xml/base.xml:506
 msgid "Latest Modification Date:"
-msgstr "最近修正した日付："
+msgstr "最終更新日："
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:518
 msgid "Delete this attachment"
-msgstr ""
+msgstr "この添付の削除"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:523
@@ -1111,446 +1121,450 @@ msgstr ""
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:527
 msgid "Add..."
-msgstr ""
+msgstr "追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:622
 #: addons/web/static/src/xml/base.xml:687
 msgid "or"
-msgstr ""
+msgstr "または"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:687
 msgid "Discard"
-msgstr ""
+msgstr "破棄"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:704
+#: addons/web/static/src/xml/base.xml:806
 msgid "Default:"
 msgstr "デフォルト："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:721
+#: addons/web/static/src/xml/base.xml:823
 msgid "Condition:"
 msgstr "状態:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:740
+#: addons/web/static/src/xml/base.xml:842
 msgid "Only you"
 msgstr "あなただけ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:747
+#: addons/web/static/src/xml/base.xml:849
 msgid "All users"
 msgstr "全てのユーザ"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:797
+#: addons/web/static/src/xml/base.xml:856
 msgid "Unhandled widget"
 msgstr "処理されないウィジェット"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:803
+#: addons/web/static/src/xml/base.xml:936
 msgid "(nolabel)"
-msgstr "(nolabel)"
+msgstr "（ラベルなし）"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:808
+#: addons/web/static/src/xml/base.xml:941
 msgid "Field:"
-msgstr "フィールド:"
+msgstr "項目："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:812
+#: addons/web/static/src/xml/base.xml:945
 msgid "Object:"
 msgstr "オブジェクト:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:816
+#: addons/web/static/src/xml/base.xml:949
 msgid "Type:"
-msgstr "タイプ:"
+msgstr "タイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:820
+#: addons/web/static/src/xml/base.xml:953
 msgid "Widget:"
 msgstr "ウィジェット:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:824
+#: addons/web/static/src/xml/base.xml:957
 msgid "Size:"
 msgstr "サイズ:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:828
+#: addons/web/static/src/xml/base.xml:961
 msgid "Context:"
-msgstr "コンテキスト"
+msgstr "コンテキスト："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:832
+#: addons/web/static/src/xml/base.xml:965
 msgid "Domain:"
-msgstr "ドメイン:"
+msgstr "ドメイン："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:836
+#: addons/web/static/src/xml/base.xml:910
+#: addons/web/static/src/xml/base.xml:969
 msgid "Modifiers:"
-msgstr "修飾:"
+msgstr "修飾："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:840
+#: addons/web/static/src/xml/base.xml:973
 msgid "Change default:"
 msgstr "デフォルトの変更："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:844
+#: addons/web/static/src/xml/base.xml:977
 msgid "On change:"
 msgstr "変更："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:848
+#: addons/web/static/src/xml/base.xml:981
 msgid "Relation:"
 msgstr "関係:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:852
+#: addons/web/static/src/xml/base.xml:985
 msgid "Selection:"
 msgstr "選択:"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:895
+#: addons/web/static/src/xml/base.xml:1040
 msgid "Open this resource"
 msgstr "このリソースを開く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:922
+#: addons/web/static/src/xml/base.xml:1063
 msgid "Select date"
 msgstr "日付を選択"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:948
 msgid "Open Resource"
-msgstr ""
+msgstr "リソースを開く"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1026
-#: addons/web/static/src/xml/base.xml:1067
+#: addons/web/static/src/xml/base.xml:1162
+#: addons/web/static/src/xml/base.xml:1205
 msgid "Set Image"
-msgstr "イメージをセット"
+msgstr "画像をセット"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1030
-#: addons/web/static/src/xml/base.xml:1082
-#: addons/web/static/src/xml/base.xml:1084
+#: addons/web/static/src/js/view_form.js:1620
+#: addons/web/static/src/xml/base.xml:1170
+#: addons/web/static/src/xml/base.xml:1220
+#: addons/web/static/src/xml/base.xml:1222
+#: addons/web/static/src/xml/base.xml:1279
 msgid "Clear"
-msgstr "クリアー"
+msgstr "クリア"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1035
-#: addons/web/static/src/xml/base.xml:1092
+#: addons/web/static/src/xml/base.xml:1179
+#: addons/web/static/src/xml/base.xml:1230
 msgid "Uploading ..."
 msgstr "アップロード中…"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1066
 msgid "width: 83px;"
-msgstr ""
+msgstr "幅：83px；"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1069
-#: addons/web/static/src/xml/base.xml:1467
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1501
 msgid "Select"
 msgstr "選択"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1075
-#: addons/web/static/src/xml/base.xml:1077
+#: addons/web/static/src/xml/base.xml:1214
+#: addons/web/static/src/xml/base.xml:1216
 msgid "Save As"
 msgstr "名前を付けて保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1126
+#: addons/web/static/src/xml/base.xml:1245
 msgid "Button"
 msgstr "ボタン"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1129
+#: addons/web/static/src/xml/base.xml:1248
 msgid "(no string)"
-msgstr "（ストリングなし）"
+msgstr "（文字列なし）"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1136
+#: addons/web/static/src/xml/base.xml:1255
 msgid "Special:"
 msgstr "特別："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1141
+#: addons/web/static/src/xml/base.xml:1260
 msgid "Button Type:"
 msgstr "ボタンのタイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1145
+#: addons/web/static/src/xml/base.xml:1264
 msgid "Method:"
-msgstr "メソッド:"
+msgstr "メソッド："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1149
+#: addons/web/static/src/xml/base.xml:1268
 msgid "Action ID:"
 msgstr "アクションID："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1159
+#: addons/web/static/src/xml/base.xml:542
 msgid "Field"
-msgstr "フィールド"
+msgstr "項目"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1205
 msgid "Advanced Search..."
-msgstr ""
+msgstr "高度な検索..."
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1230
+#: addons/web/static/src/xml/base.xml:1287
 msgid "-- Filters --"
 msgstr "--フィルタ--"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1239
+#: addons/web/static/src/xml/base.xml:1296
 msgid "-- Actions --"
 msgstr "--アクション--"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1240
+#: addons/web/static/src/xml/base.xml:1297
 msgid "Add Advanced Filter"
 msgstr "高度なフィルタを追加"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1241
+#: addons/web/static/src/xml/base.xml:1298
 msgid "Save Filter"
 msgstr "フィルタを保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1247
+#: addons/web/static/src/xml/base.xml:1305
 msgid "Filter Name:"
-msgstr "フィルタ名"
+msgstr "フィルタ名："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1249
+#: addons/web/static/src/xml/base.xml:1307
 msgid "(Any existing filter with the same name will be replaced)"
 msgstr "（同じ名前の既存のフィルタは置き換えられます）"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1376
 msgid "Custom Filters"
-msgstr ""
+msgstr "カスタムフィルタ"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1379
 msgid "Save current filter"
-msgstr ""
+msgstr "現在のフィルタを保存"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1381
 msgid "Filter name"
-msgstr ""
+msgstr "フィルタ名"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1383
 msgid "Share with all users"
-msgstr ""
+msgstr "全てのユーザと共有"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1392
+#: addons/web/static/src/js/search.js:298
+#: addons/web/static/src/xml/base.xml:1299
 msgid "Add to Dashboard"
 msgstr "ダッシュボードに追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1394
 msgid "Title of new Dashboard item"
-msgstr ""
+msgstr "新しいダッシュボード項目のタイトル"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1395
 msgid "save"
-msgstr ""
+msgstr "保存"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1399
 msgid "Select Dashboard to add this filter to"
-msgstr ""
+msgstr "このフィルタを加えるためのダッシュボードの選択"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1406
 msgid "Advanced Search"
-msgstr ""
+msgstr "高度な検索"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1411
 msgid "Add a condition"
-msgstr ""
+msgstr "条件の追加"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1412
 msgid "Apply"
-msgstr ""
+msgstr "適用"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1475
+#: addons/web/static/src/xml/base.xml:1509
 msgid "Save & New"
 msgstr "保存して新規"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1476
+#: addons/web/static/src/xml/base.xml:1510
 msgid "Save & Close"
 msgstr "保存して閉じる"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1559
+#: addons/web/static/src/xml/base.xml:1617
 msgid ""
 "This wizard will export all data that matches the current search criteria to "
 "a CSV file.\n"
 "            You can export all data or only the fields that can be "
 "reimported after modification."
 msgstr ""
-"このウェザードは，検索条件に合った全てのデータをCSVファイルとしてエクスポートします。\n"
-"　　　　　　　　　　　　全てのデータあるいは変更したあと再インポートできるフィールドのみをエクスポートできます。"
+"このウィザードは，現在の検索条件に合致した全てのデータをCSVファイルとしてエクスポートします。\n"
+"　　　　　　　　　　　　全てのデータ，または変更後に再インポートした項目のみをエクスポートできます。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1566
+#: addons/web/static/src/xml/base.xml:1624
 msgid "Export Type:"
 msgstr "エクスポートのタイプ："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1568
+#: addons/web/static/src/xml/base.xml:1626
 msgid "Import Compatible Export"
 msgstr "インポートと互換性があるエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1569
+#: addons/web/static/src/xml/base.xml:1627
 msgid "Export all Data"
 msgstr "全てのデータをエクスポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1572
+#: addons/web/static/src/xml/base.xml:1630
 msgid "Export Formats"
 msgstr "エクスポートの形式"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1578
+#: addons/web/static/src/xml/base.xml:1636
 msgid "Available fields"
-msgstr "利用可能なフィールド"
+msgstr "利用可能な項目"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1580
+#: addons/web/static/src/xml/base.xml:1638
 msgid "Fields to export"
-msgstr "エクスポートするフィールド"
+msgstr "エクスポートする項目"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1582
+#: addons/web/static/src/xml/base.xml:1640
 msgid "Save fields list"
-msgstr "フィールドリストを保存"
+msgstr "項目リストを保存"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1596
+#: addons/web/static/src/xml/base.xml:1654
 msgid "Remove All"
 msgstr "全てを削除"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1607
+#: addons/web/static/src/xml/base.xml:1666
 msgid "Name"
 msgstr "名前"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1639
+#: addons/web/static/src/xml/base.xml:1699
 msgid "Save as:"
 msgstr "名前を付けて保存 :"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1645
+#: addons/web/static/src/xml/base.xml:1706
 msgid "Saved exports:"
-msgstr "保存されたエクスポート"
+msgstr "保存されたエクスポート："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1663
+#: addons/web/static/src/xml/base.xml:1748
 msgid "1. Import a .CSV file"
 msgstr "1. CVSファイルのインポート"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1664
+#: addons/web/static/src/xml/base.xml:1749
 msgid ""
 "Select a .CSV file to import. If you need a sample of file to import,\n"
 "       you should use the export tool with the \"Import Compatible\" option."
 msgstr ""
-"インポートするファイルのサンプルが必要ならば，インポートするCSVファイルを選択\n"
-"　　　　　　インポート互換のエクスポートツールを使ってください"
+"インポートするファイルのサンプルが必要ならば、インポートするCSVファイルを選択します。\n"
+"　　　　　　エクスポートツールでインポート互換オプションを使って下さい。"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1668
+#: addons/web/static/src/xml/base.xml:1753
 msgid "CSV File:"
-msgstr "CSVファイル"
+msgstr "CSVファイル："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1671
+#: addons/web/static/src/xml/base.xml:1756
 msgid "2. Check your file format"
-msgstr "2. ファイル形式をチェックしてください"
+msgstr "2. ファイル形式のチェック"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1674
+#: addons/web/static/src/xml/base.xml:1759
 msgid "Import Options"
 msgstr "インポートオプション"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1678
+#: addons/web/static/src/xml/base.xml:1763
 msgid "Does your file have titles?"
 msgstr "そのファイルはタイトルを持っていますか？"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1684
+#: addons/web/static/src/xml/base.xml:1769
 msgid "Separator:"
-msgstr "区切り文字:"
+msgstr "区切り文字："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1686
+#: addons/web/static/src/xml/base.xml:1771
 msgid "Delimiter:"
-msgstr "区切り文字:"
+msgstr "区切り文字："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1690
+#: addons/web/static/src/xml/base.xml:1775
 msgid "Encoding:"
-msgstr "エンコーディング:"
+msgstr "エンコード："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1693
+#: addons/web/static/src/xml/base.xml:1778
 msgid "UTF-8"
 msgstr "UTF-8"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1694
+#: addons/web/static/src/xml/base.xml:1779
 msgid "Latin 1"
 msgstr "ラテン1"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid "Lines to skip"
 msgstr "スキップする行"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1697
+#: addons/web/static/src/xml/base.xml:1782
 msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
-msgstr "CVSファイルが，複数行にタイトルを持っていたら，インポートの際に１行以上をスキップする"
+msgstr "CVSファイルが複数行であり、タイトルを持っていた場合、インポートの際に１行以上をスキップするために使用します"
 
 #. openerp-web
 #: addons/web/static/src/xml/base.xml:1713
 msgid "--- Don't Import ---"
-msgstr ""
+msgstr "---インポートなし---"
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1724
+#: addons/web/static/src/xml/base.xml:1809
 msgid "The import failed due to:"
 msgstr "次の理由でインポートに失敗しました："
 
 #. openerp-web
-#: addons/web/static/src/xml/base.xml:1726
+#: addons/web/static/src/xml/base.xml:1811
 msgid "Here is a preview of the file we could not import:"
-msgstr "インポートできなかったファイルのポレビュー："
+msgstr "インポートできなかったファイルのプレビュー："
 
 #~ msgid "Filter Entry"
 #~ msgstr "フィルター項目"
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 29425e178cb..00ea538f586 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -8,135 +8,135 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-22 02:18+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:27+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:12
+#: addons/web_calendar/static/src/js/calendar.js:11
 msgid "Calendar"
 msgstr "カレンダー"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:73
+#: addons/web_calendar/static/src/js/calendar.js:70
 msgid "Filter"
-msgstr ""
-
-#. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:139
-msgid "Today"
-msgstr ""
-
-#. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:140
-msgid "Day"
-msgstr ""
-
-#. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:141
-msgid "Week"
-msgstr ""
-
-#. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:142
-msgid "Month"
-msgstr ""
-
-#. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:143
-msgid "New event"
-msgstr ""
+msgstr "フィルタ"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:144
-msgid "Save"
-msgstr ""
+msgid "Today"
+msgstr "本日"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:145
-msgid "Cancel"
-msgstr ""
+msgid "Day"
+msgstr "日"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:146
-msgid "Details"
-msgstr ""
+msgid "Week"
+msgstr "週"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:147
-msgid "Edit"
-msgstr ""
+msgid "Month"
+msgstr "月"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:148
-msgid "Delete"
-msgstr ""
+msgid "New event"
+msgstr "新規イベント"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:149
+msgid "Save"
+msgstr "保存"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:150
-msgid "Event will be deleted permanently, are you sure?"
-msgstr ""
+msgid "Cancel"
+msgstr "キャンセル"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:151
-#: addons/web_calendar/static/src/js/calendar.js:164
-msgid "Description"
-msgstr ""
+msgid "Details"
+msgstr "詳細"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:152
-msgid "Time period"
-msgstr ""
+msgid "Edit"
+msgstr "編集"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:153
-msgid "Full day"
-msgstr ""
+msgid "Delete"
+msgstr "削除"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:155
+msgid "Event will be deleted permanently, are you sure?"
+msgstr "イベントは完全に削除されます。よろしいですか？"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:156
-msgid "Do you want to edit the whole set of repeated events?"
-msgstr ""
+#: addons/web_calendar/static/src/js/calendar.js:169
+msgid "Description"
+msgstr "詳細"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:157
-msgid "Repeat event"
-msgstr ""
+msgid "Time period"
+msgstr "期間"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:158
-msgid "Disabled"
-msgstr ""
+msgid "Full day"
+msgstr "終日"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:159
-msgid "Enabled"
-msgstr ""
+#: addons/web_calendar/static/src/js/calendar.js:161
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "繰り返しイベントのセット全体を編集しますか？"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:162
-#: addons/web_calendar/static/src/js/calendar.js:170
-msgid "Agenda"
-msgstr ""
+msgid "Repeat event"
+msgstr "繰り返しイベント"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:163
-msgid "Date"
-msgstr ""
+msgid "Disabled"
+msgstr "無効"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:164
+msgid "Enabled"
+msgstr "有効"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:167
-msgid "Year"
-msgstr ""
+#: addons/web_calendar/static/src/js/calendar.js:175
+msgid "Agenda"
+msgstr "議事"
 
 #. openerp-web
-#: addons/web_calendar/static/src/xml/web_calendar.xml:8
-#: addons/web_calendar/static/src/xml/web_calendar.xml:9
+#: addons/web_calendar/static/src/js/calendar.js:168
+msgid "Date"
+msgstr "日付"
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:172
+msgid "Year"
+msgstr "年"
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/xml/web_calendar.xml:6
 msgid "&nbsp;"
 msgstr "&nbsp;"
 
diff --git a/addons/web_dashboard/i18n/ja.po b/addons/web_dashboard/i18n/ja.po
index 67544fd96c2..6b59633054b 100644
--- a/addons/web_dashboard/i18n/ja.po
+++ b/addons/web_dashboard/i18n/ja.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-26 22:14+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:61
+#: addons/web_dashboard/static/src/js/dashboard.js:60
 msgid "Edit Layout"
-msgstr "レイアウトを編集"
+msgstr "レイアウトの編集"
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:107
+#: addons/web_dashboard/static/src/js/dashboard.js:106
 msgid "Are you sure you want to remove this item ?"
-msgstr "この項目を取り除きますか？"
+msgstr "この項目を削除しますか？"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
 msgid "Reset Layout.."
-msgstr "レイアウトをリセット"
+msgstr "レイアウトのリセット"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
@@ -40,12 +40,12 @@ msgstr "リセット"
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
 msgid "Change Layout.."
-msgstr "レイアウトを変更…"
+msgstr "レイアウトの変更…"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
 msgid "Change Layout"
-msgstr "レイアウトを変更"
+msgstr "レイアウトの変更"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
@@ -60,7 +60,7 @@ msgstr "作成"
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
 msgid "Choose dashboard layout"
-msgstr "ダッシュボードのレイアウトを選択"
+msgstr "ダッシュボードレイアウトの選択"
 
 #, python-format
 #~ msgid "Execute task \"%s\""
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 73204874dca..bd1625fe9df 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-26 22:02+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:37+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
@@ -25,7 +25,7 @@ msgstr "ダイアグラム"
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:165
 msgid "Are you sure?"
-msgstr ""
+msgstr "本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:195
@@ -35,6 +35,10 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"このノードの削除は元に戻すことができません。\n"
+"また、接続している全ての取引を削除します。\n"
+"\n"
+"本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:213
@@ -43,18 +47,21 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"この取引の削除は元に戻すことができません。\n"
+"\n"
+"本当によろしいですか？"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:224
 #: addons/web_diagram/static/src/js/diagram.js:257
 msgid "Activity"
-msgstr "アクティビティ"
+msgstr "活動"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:232
 #: addons/web_diagram/static/src/js/diagram.js:296
 msgid "Open: "
-msgstr "開く: "
+msgstr "開く： "
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:262
@@ -66,9 +73,9 @@ msgstr "作成："
 #: addons/web_diagram/static/src/js/diagram.js:289
 #: addons/web_diagram/static/src/js/diagram.js:308
 msgid "Transition"
-msgstr "変遷"
+msgstr "遷移"
 
 #. openerp-web
 #: addons/web_diagram/static/src/xml/base_diagram.xml:6
 msgid "New Node"
-msgstr "新しいノード"
+msgstr "新規ノード"
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 8b141d2be75..d16a0e5452f 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-26 21:57+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 01:37+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
@@ -25,4 +25,4 @@ msgstr "ガント"
 #. openerp-web
 #: addons/web_gantt/static/src/xml/web_gantt.xml:10
 msgid "Create"
-msgstr "作成する"
+msgstr "作成"
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 8482120754c..7fa475e3bcb 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -8,91 +8,91 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-02-22 02:21+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 03:25+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
-#: addons/web_graph/static/src/js/graph.js:22
+#: addons/web_graph/static/src/js/graph.js:19
 msgid "Graph"
 msgstr "グラフ"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:5
 msgid "Graph Options"
-msgstr ""
+msgstr "グラフオプション"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:7
 msgid "Graph Mode"
-msgstr ""
+msgstr "グラフモード"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:11
 msgid "Pie"
-msgstr ""
+msgstr "パイ"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:12
 msgid "Bars"
-msgstr ""
+msgstr "バー"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:14
 msgid "Lines"
-msgstr ""
+msgstr "ライン"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:15
 msgid "Areas"
-msgstr ""
+msgstr "エリア"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:18
 msgid "Radar"
-msgstr ""
+msgstr "レーダー"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:20
 msgid "Legend"
-msgstr ""
+msgstr "凡例"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:24
 msgid "Hidden"
-msgstr ""
+msgstr "非表示"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:25
 msgid "Inside"
-msgstr ""
+msgstr "内側"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:26
 msgid "Top"
-msgstr ""
+msgstr "上"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:28
 msgid "Actions"
-msgstr ""
+msgstr "アクション"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:32
 msgid "Switch Axis"
-msgstr ""
+msgstr "Axisに切替"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:33
 msgid "Show Data"
-msgstr ""
+msgstr "データの表示"
 
 #. openerp-web
 #: addons/web_graph/static/src/xml/web_graph.xml:34
 msgid "Download as PNG"
-msgstr ""
+msgstr "PNGとしてダウンロード"
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 15e0ee4ca71..440a2e15fbd 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -8,59 +8,59 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-06 06:35+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 03:34+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
 msgid "Kanban"
-msgstr "看板"
+msgstr "かんばん"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:372
+#: addons/web_kanban/static/src/js/kanban.js:293
 msgid "Undefined"
 msgstr "未定義"
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:684
+#: addons/web_kanban/static/src/js/kanban.js:468
 msgid "Are you sure you want to delete this record ?"
 msgstr "このレコードを削除しますか？"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:839
 msgid "Create: "
-msgstr ""
+msgstr "作成： "
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
 msgid "Show more... ("
-msgstr "もっと表示する…（"
+msgstr "さらに表示…（"
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
 msgid "remaining)"
 msgstr "残り）"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "Add"
-msgstr ""
+msgstr "追加"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
 msgid "or"
-msgstr ""
+msgstr "または"
 
 #. openerp-web
 #: addons/web_kanban/static/src/xml/web_kanban.xml:72
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #~ msgid "</tr><tr>"
 #~ msgstr "</tr><tr>"
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 925b09df687..9be55cb112a 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-31 18:42+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 04:00+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
@@ -25,7 +25,7 @@ msgstr "OpenERP"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:22
 msgid "Database:"
-msgstr "データベース:"
+msgstr "データベース："
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:30
@@ -65,7 +65,7 @@ msgstr "お気に入り"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:58
 msgid "Preference"
-msgstr "優先"
+msgstr "プリファレンス"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:123
@@ -75,7 +75,7 @@ msgstr "ログアウト"
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:132
 msgid "There are no records to show."
-msgstr "表示するレコードはありません"
+msgstr "表示するレコードはありません。"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:183
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index 3cda259f125..4cc24782acb 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-07-02 09:06+0200\n"
-"PO-Revision-Date: 2012-03-26 22:04+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-07-19 04:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-03 05:55+0000\n"
-"X-Generator: Launchpad (build 15531)\n"
+"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
+"X-Generator: Launchpad (build 15637)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
@@ -30,7 +30,7 @@ msgstr "保存"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:6
 msgid "Process View"
-msgstr "プロセス一覧"
+msgstr "プロセスビュー"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:19
@@ -40,7 +40,7 @@ msgstr "ドキュメンテーション"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:19
 msgid "Read Documentation Online"
-msgstr "オンラインのドキュメンテーションを読んでください。"
+msgstr "オンラインのドキュメントを読んで下さい"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:25
@@ -55,12 +55,12 @@ msgstr "コミュニティの議論"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:31
 msgid "Books"
-msgstr "帳簿"
+msgstr "本"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:31
 msgid "Get the books"
-msgstr "帳簿を取る"
+msgstr "本を手に入れる"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:37
@@ -85,7 +85,7 @@ msgstr "注記"
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:59
 msgid "Last modified by:"
-msgstr "最後に変更："
+msgstr "最終更新者："
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:59
@@ -105,14 +105,14 @@ msgstr "関係："
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:88
 msgid "Select Process"
-msgstr "プロセスを選んでください"
+msgstr "プロセスの選択"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:98
 msgid "Select"
-msgstr "選択する"
+msgstr "選択"
 
 #. openerp-web
 #: addons/web_process/static/src/xml/web_process.xml:109
 msgid "Edit Process"
-msgstr "プロセスを編集"
+msgstr "プロセスの編集"

From e068ed26636212575245fad882ea549e3a505d91 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 19 Jul 2012 11:08:03 +0530
Subject: [PATCH 329/397] [IMP]vat to tax : changed the label Vat as its
 abbreviation

bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm
---
 addons/account/account.py                     | 26 +++++++++----------
 addons/account/account_move_line.py           |  4 +--
 .../data/configurable_account_chart.xml       |  6 ++---
 addons/account/demo/account_minimal.xml       |  4 +--
 .../report/account_journal_sale_purchase.rml  |  6 ++---
 .../account/report/account_print_invoice.rml  |  2 +-
 .../account/report/account_print_overdue.rml  |  2 +-
 addons/account/wizard/account_vat_view.xml    |  4 +--
 .../account_coda/account_coda_comm_type.xml   |  2 +-
 .../account_coda_trans_category.xml           |  2 +-
 .../account_coda/account_coda_trans_code.xml  |  4 +--
 .../report/account_followup_print.rml         |  2 +-
 addons/l10n_th/account_data.xml               | 20 +++++++-------
 addons/l10n_us/account_tax_template.xml       |  2 +-
 addons/mrp_repair/report/order.rml            |  4 +--
 addons/point_of_sale/report/pos_lines.rml     |  2 +-
 addons/report_intrastat/report/invoice.rml    |  2 +-
 addons/sale/report/sale_order.rml             |  4 +--
 18 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 78d0a192237..3675e89c06d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1880,17 +1880,17 @@ class account_tax(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the TAX declaration
+        # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the TAX declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the TAX declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the TAX declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the TAX declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2217,7 +2217,7 @@ class account_tax(osv.osv):
     def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
-        Price Unit is a TAX included price
+        Price Unit is a Tax included price
 
         RETURN:
             [ tax ]
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2788,17 +2788,17 @@ class account_tax_template(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the TAX declaration
+        # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the TAX declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the TAX declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the TAX declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the TAX declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e9f3459ad2c..5eb56bfa645 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -327,7 +327,7 @@ class account_move_line(osv.osv):
 
         if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
             data['account_id'] = account.id
-            # Propose the price TAX excluded, the TAX will be added when confirming line
+            # Propose the price Tax excluded, the Tax will be added when confirming line
             if account.tax_ids:
                 taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
                 tax = tax_obj.browse(cr, uid, taxes)
@@ -1347,7 +1347,7 @@ class account_move_line(osv.osv):
                     }
                     if data['tax_code_id']:
                         self.create(cr, uid, data, context)
-                #create the TAX movement
+                #create the Tax movement
                 data = {
                     'move_id': vals['move_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 345202de899..21a58fb2a6d 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -385,8 +385,8 @@
             <field name="complete_tax_set" eval="False"/>
         </record>
 
-         <!-- TAX Codes -->
-        <!-- Purchases + Output TAX -->
+         <!-- Tax Codes -->
+        <!-- Purchases + Output Tax -->
 
         <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
@@ -444,7 +444,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input TAX -->
+        <!-- Sales + Input Tax -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 3592c82d6f8..b13af6a735c 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -94,7 +94,7 @@
 
         <record id="ova" model="account.account">
             <field name="code">X11003</field>
-            <field name="name">Output TAX - (test)</field>
+            <field name="name">Output Tax - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_asset"/>
@@ -152,7 +152,7 @@
 
         <record id="iva" model="account.account">
             <field name="code">X1112</field>
-            <field name="name">Input TAX - (test)</field>
+            <field name="name">Input Tax - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_liability"/>
diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml
index 69f26ce1ff8..236879669f9 100644
--- a/addons/account/report/account_journal_sale_purchase.rml
+++ b/addons/account/report/account_journal_sale_purchase.rml
@@ -219,7 +219,7 @@
             <td><para style="P10a">Account</para></td>
             <td><para style="P10a">Partner</para></td>
             <td><para style="P10a">Label</para></td>
-            <td><para style="P10a">TAX</para></td>
+            <td><para style="P10a">Tax</para></td>
             <td><para style="P11"></para></td>
             <td><para style="P10b">Debit</para></td>
             <td><para style="P10b">Credit</para></td>
@@ -271,7 +271,7 @@
         <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Label</para></td>
-        <td><para style="P10a">TAX</para></td>
+        <td><para style="P10a">Tax</para></td>
         <td><para style="P11"></para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
@@ -330,7 +330,7 @@
         <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1">
           <tr>
             <td><para style="P12"></para></td>
-            <td><para style="P12">TAX Declaration</para></td>
+            <td><para style="P12">Tax Declaration</para></td>
             <td><para style="P12"></para></td>
             <td><para style="P12"></para></td>
           </tr>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 12192f8472b..4ffa7a33f9d 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -168,7 +168,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 6b4253d99f9..2d4238823da 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -138,7 +138,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">TAX: [[ o.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT: [[ o.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 44dae7ec5ac..6e5dc09b816 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a TAX declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a Tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a TAX declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a Tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/account_coda/account_coda_comm_type.xml
index 4a1c74ca770..07d8244358b 100644
--- a/addons/account_coda/account_coda_comm_type.xml
+++ b/addons/account_coda/account_coda_comm_type.xml
@@ -73,7 +73,7 @@
         </record>
         <record id="acct_106" model="account.coda.comm.type">
             <field name="code">106</field>
-            <field name="description">Method of calculation (TAX, withholding tax on income, commission, etc.)</field>
+            <field name="description">Method of calculation (Tax, withholding tax on income, commission, etc.)</field>
         </record>
         <record id="acct_107" model="account.coda.comm.type">
             <field name="code">107</field>
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/account_coda/account_coda_trans_category.xml
index e2d46e017b4..d96282bb422 100644
--- a/addons/account_coda/account_coda_trans_category.xml
+++ b/addons/account_coda/account_coda_trans_category.xml
@@ -49,7 +49,7 @@
         </record>
         <record id="actrca_011" model="account.coda.trans.category">
             <field name="category">011</field>
-            <field name="description">TAX</field>
+            <field name="description">Tax</field>
         </record>
         <record id="actrca_012" model="account.coda.trans.category">
             <field name="category">012</field>
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/account_coda/account_coda_trans_code.xml
index 4f4e0d9f3cf..4ab9650d59a 100644
--- a/addons/account_coda/account_coda_trans_code.xml
+++ b/addons/account_coda/account_coda_trans_code.xml
@@ -382,7 +382,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_03"/>
             <field name="description">Reimbursement of cheque-related costs</field>
-            <field name="comment">Overall amount, TAX included</field>
+            <field name="comment">Overall amount, Tax included</field>
         </record>
         <record id="actcc_03_99" model="account.coda.trans.code">
             <field name="code">99</field>
@@ -1850,7 +1850,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_80"/>
             <field name="description">Miscellaneous fees and commissions</field>
-            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). TAX excluded = type 0 TAX included = type 3 (at least 3 articles)</field>
+            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). Tax excluded = type 0 Tax included = type 3 (at least 3 articles)</field>
         </record>
         <record id="actcc_80_35" model="account.coda.trans.code">
             <field name="code">35</field>
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 83fcfe0f24c..3d096ecf3ac 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -141,7 +141,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">TAX: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 53af51f40d4..84ccb182792 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -125,7 +125,7 @@
 
 <record id="a_input_vat" model="account.account.template">
     <field name="code">1510</field>
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="parent_id" ref="a_assets"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -187,7 +187,7 @@
 
 <record id="a_output_vat" model="account.account.template">
     <field name="code">2310</field>
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="parent_id" ref="a_liabilities"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -333,7 +333,7 @@
     <field name="parent_id" ref="tc_root"/>
 </record>
 
-<!-- TAX -->
+<!-- Tax -->
 
 <record id="tc_base_vat" model="account.tax.code.template">
     <field name="name">Value Added Tax</field>
@@ -341,13 +341,13 @@
 </record>
 
 <record id="tc_base_output" model="account.tax.code.template">
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="code">PP30_4</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
 
 <record id="tc_base_input" model="account.tax.code.template">
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="code">PP30_6</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
@@ -397,7 +397,7 @@
 
 <!-- TAXES TO BE PAID -->
 
-<!-- TAX -->
+<!-- Tax -->
 
 <record id="tc_tax" model="account.tax.code.template">
     <field name="name">Taxes to be paid</field>
@@ -410,13 +410,13 @@
 </record>
 
 <record id="tc_tax_vat_output" model="account.tax.code.template">
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="code">PP30_5</field>
     <field name="parent_id" ref="tc_tax_vat"/>
 </record>
 
 <record id="tc_tax_vat_input" model="account.tax.code.template">
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="code">PP30_7</field>
     <field name="parent_id" ref="tc_tax_vat"/>
     <field name="sign" eval="-1"/>
@@ -485,7 +485,7 @@
 
 <record id="tax_input_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_input_vat"/>
@@ -497,7 +497,7 @@
 
 <record id="tax_output_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_output_vat"/>
diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index 292872a7b6e..6e70700a9f3 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -27,7 +27,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input TAX -->
+        <!-- Sales + Input Tax -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 794aa13e2b9..be5737d4b85 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -169,7 +169,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -278,7 +278,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 6ec3e728653..be394ed4f16 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -150,7 +150,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index e76e3a00196..c07bd06f402 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -148,7 +148,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 2a0b4b1955a..8fecc17e62c 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -134,7 +134,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -236,7 +236,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>

From 92cb98fd73fcb064ae72ed489a6f3dafd236e43d Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:08:13 +0530
Subject: [PATCH 330/397] [REVERT] account: analytical line view

bzr revid: hmo@tinyerp.com-20120719053813-y7vdq59yjw2svhen
---
 addons/account/project/project_view.xml | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8e2006b8d29..76aaaf7df6a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -124,27 +124,33 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="date"/>
-                            <label for="unit_amount"/>
-                                <group class="oe_inline">
-                                    <field name="unit_amount" nolabel="1"/>
-                                    <field name="product_uom_id" nolabel="1" />
-                                </group>
-                            <field name="amount"/>
-                        </group>
-                        <group>
                             <field name="account_id"/>
                             <field name="journal_id"/>
-                            <field name="product_id"/>
                         </group>
                         <group>
+                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group>
+                        <group string="Amount">
+                            <field name="amount"/>
+                            <label for="amount_currency"/>
+                            <div>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="Product Information">
+                            <field name="product_id"/>
+                            <label for="unit_amount"/>
+                            <div>
+                                <field name="unit_amount" class="oe_inline"/>
+                                <field name="product_uom_id" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="General Accounting">
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
-                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>

From 1d5035f250935581338cbc88ccc8518ad1cb3ccc Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:30:17 +0530
Subject: [PATCH 331/397] [FIX] base: res_partner_view, history tab, put
 comment and give proper name

bzr revid: hmo@tinyerp.com-20120719060017-h55rul0ltn1ly3g1
---
 openerp/addons/base/res/res_partner_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index fd8830da9ff..882980c0f0f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -229,12 +229,13 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="History" name="History" invisible="True">
-                            <group name="Tasks" string="Tasks" invisible="True"></group> 
-                            <group name="Claim" string="Claim" invisible="True"></group>
-                            <group name="Event" string="Event" invisible="True"></group>
-                            <group name="Registration" string="Registration" invisible="True"></group>
-                            <group name="Campaign" string="Campaign" invisible="True"></group>
+                        <!-- FIX group to add fields in proper sequence order in history page but it's not good solution. we have to add sequence attribute in group element.-->
+                        <page string="History" name="page_history" invisible="True">
+                            <group name="grp_task" string="Tasks" invisible="True"></group> <!-- this group will be visible after install project module -->
+                            <group name="grp_claim" string="Claim" invisible="True"></group> <!-- this group will be visible after install crm_claim module -->
+                            <group name="grp_event" string="Event" invisible="True"></group> <!-- this group will be visible after install event module -->
+                            <group name="grp_registration" string="Registration" invisible="True"></group> <!-- this group will be visible after install event module -->
+                            <group name="grp_campaign" string="Campaign" invisible="True"></group> <!-- this group will be visible after install marketing_campaign module -->
                         </page>
                         <page string="Internal Notes">
                             <field name="comment" placeholder="Internal notes about this customer..."/>

From 85aa1450c6a30ded29a68c58009084a4cb542c6c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 19 Jul 2012 11:46:37 +0530
Subject: [PATCH 332/397] [FIX] put comment regarding TOFIX to set sequence
 into group element

bzr revid: hmo@tinyerp.com-20120719061637-p9j9ydzku61t8np1
---
 addons/crm_claim/crm_claim_view.xml            |  7 ++++---
 addons/event/res_partner_view.xml              | 12 ++++++------
 addons/marketing_campaign/res_partner_view.xml |  7 ++++---
 addons/project/res_partner_view.xml            |  7 ++++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6317d53a1cc..f00b524a204 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,16 +248,17 @@
             </field>
         </record>
 
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Claim']" position="attributes">
+                <xpath expr="//group[@name='grp_claim']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -270,7 +271,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//group[@name='Claim']" position="inside">
+                    <xpath expr="//group[@name='grp_claim']" position="inside">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 007feb5ec02..44a3d4613ec 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,7 +3,7 @@
     <data>
 
          <!--  Partners inherited form -->
-
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="view_speaker_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.speaker.info.inherit</field>
             <field name="model">res.partner</field>
@@ -13,13 +13,13 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Event']" position="attributes">
+                <xpath expr="//group[@name='grp_event']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Registration']" position="attributes">
+                <xpath expr="//group[@name='grp_registration']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -30,7 +30,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <group name="Event" position="inside">
+                <group name="grp_event" position="inside">
                     <field name="event_ids" colspan="4" nolabel="1">
                         <tree string="Events">
                             <field name="name" string="Event"/>
@@ -38,7 +38,7 @@
                         </tree>
                     </field>
                    </group>
-                   <group name="Registration" position="inside">
+                   <group name="grp_registration" position="inside">
                     <field name="event_registration_ids" colspan="4" nolabel="1">
                         <tree string="Events Registration">
                             <field name="event_begin_date" string="Date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index b8ff13367d1..2b1b9dc09dd 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
         <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
            <field name="name">res.partner.crm.history.inherit2</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Campaign']" position="attributes">
+                <xpath expr="//group[@name='grp_campaign']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
            </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="Campaign" position="inside">
+                    <group name="grp_campaign" position="inside">
                             <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
             </field>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 5d0544b78ef..3c2dde07376 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,16 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
+         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
          <record id="base.view_crm_partner_info_History" model="ir.ui.view">
             <field name="name">res.partner.crm.history.inherit1</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='History']" position="attributes">
+                <xpath expr="//page[@name='page_history']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='Tasks']" position="attributes">
+                <xpath expr="//group[@name='grp_task']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
@@ -23,7 +24,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="Tasks" position="inside">
+                   <group name="grp_task" position="inside">
                     <field name="task_ids" colspan="4" nolabel="1">
                         <tree string="Tasks" editable="bottom">
                             <field name="name"/>

From 6dc3b762551150774842d6fc1f57d8421f010462 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 19 Jul 2012 10:19:14 +0200
Subject: [PATCH 333/397] [IMP] in dialog box 'Set Default', for many2one
 fields, show display_name instead of value (id)

bzr revid: rco@openerp.com-20120719081914-lchgb4k409fam1te
---
 addons/web/static/src/js/view_form.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2e404a6bfdd..c430b013c40 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -865,6 +865,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                             return option[0] === value;
                         })[1];
                     break;
+                case 'many2one':
+                    displayed = field.get_displayed();
+                    break;
                 }
 
                 return {
@@ -2781,6 +2784,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this._super(value_);
         this.inhibit_on_change = false;
     },
+    get_displayed: function() {
+        return this.display_value["" + this.get("value")];
+    },
     add_id: function(id) {
         this.display_value = {};
         this.set({value: id});

From cf4f258306381903ecc20dd972b607888053d662 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 19 Jul 2012 14:12:03 +0530
Subject: [PATCH 334/397] [IMP]crm: improve button sequence and fix value error
 on button and improve name of view

bzr revid: mma@tinyerp.com-20120719084203-ww4pc42oz2rnma3e
---
 addons/crm/crm_lead_menu.xml      |  2 +-
 addons/crm/crm_lead_view.xml      |  4 +---
 addons/crm/crm_phonecall_view.xml | 16 +++++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index cbcd5b3b3bd..fde288c4a45 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunities</field>
+          <field name="name">Opportunity</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 73c687e4ad0..f7bd27854f1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,8 +97,7 @@
                 groups="base.group_sale_salesman"
                 res_model="crm.phonecall"
                 view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-                domain="[('opportunity_id', '=', active_id)]"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
                 view_type="form"/>
 
         <act_window
@@ -107,7 +106,6 @@
                 res_model="crm.meeting"
                 view_mode="tree,form,calendar"
                 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-                domain="[('opportunity_id', '=', active_id)]"
                 view_type="form"/>
 
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1f15e29263b..e83ad45d851 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -101,23 +101,25 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="case_open" string="Confirm" type="object" class="oe_highlight"
-                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending"/>
-                <button string="Convert to Opportunity"  class="oe_highlight"
+                <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+                <button string="Convert to Opportunity" class="oe_highlight"
+                        name="%(phonecall2opportunity_act)d"
+                        type="action"
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
                 <button string="Schedule Other Call"
                         name="%(phonecall_to_phonecall_act)d"
                         type="action"  />
                 <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
-                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
+                <button name="case_cancel" string="Cancel" type="object"
+                        states="draft,open,pending"/>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
             <sheet string="Phone Call">
                   <div class="oe_title">

From fab1961534114394abda674015f4e70a6897bd79 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:02:04 +0200
Subject: [PATCH 335/397] [IMP] sales/crm: usability review of form views

bzr revid: qdp-launchpad@openerp.com-20120719090204-9a02uqu6vzdwm2ab
---
 openerp/addons/base/res/res_partner_view.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 882980c0f0f..bfe0533e6cb 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -229,13 +229,8 @@
                                 </group>
                             </group>
                         </page>
-                        <!-- FIX group to add fields in proper sequence order in history page but it's not good solution. we have to add sequence attribute in group element.-->
+                        <!-- The History page becomes visible as soon as there is something to display inside -->
                         <page string="History" name="page_history" invisible="True">
-                            <group name="grp_task" string="Tasks" invisible="True"></group> <!-- this group will be visible after install project module -->
-                            <group name="grp_claim" string="Claim" invisible="True"></group> <!-- this group will be visible after install crm_claim module -->
-                            <group name="grp_event" string="Event" invisible="True"></group> <!-- this group will be visible after install event module -->
-                            <group name="grp_registration" string="Registration" invisible="True"></group> <!-- this group will be visible after install event module -->
-                            <group name="grp_campaign" string="Campaign" invisible="True"></group> <!-- this group will be visible after install marketing_campaign module -->
                         </page>
                         <page string="Internal Notes">
                             <field name="comment" placeholder="Internal notes about this customer..."/>

From 9e7bcb9c4068cd16a9b187692d90faafa40f9b49 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:02:43 +0200
Subject: [PATCH 336/397] [IMP] sales/crm: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120719090243-bdya6ozfklsi6v2k
---
 addons/account/partner_view.xml               |  2 +-
 addons/base_calendar/base_calendar.py         |  2 +-
 addons/crm/crm_meeting_view.xml               |  2 +
 addons/crm_claim/crm_claim_view.xml           | 26 ++------
 addons/event/res_partner_view.xml             | 64 ++++++++-----------
 addons/l10n_fr_rib/bank_view.xml              |  4 +-
 .../marketing_campaign/res_partner_view.xml   | 26 +++-----
 addons/membership/membership_view.xml         |  9 ++-
 addons/plugin_outlook/plugin_outlook.xml      |  2 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  3 +-
 addons/product/product_view.xml               |  7 +-
 addons/project/res_partner_view.xml           | 44 +++++--------
 addons/stock/stock_view.xml                   |  2 +-
 13 files changed, 79 insertions(+), 114 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 53f556b77c2..cd75daa6c07 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -115,7 +115,7 @@
                                 <group name="bank" string="Information About the Bank">
                                     <field name="bank" on_change="onchange_bank_id(bank)"/>
                                     <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="[Identifier code]"/>
+                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
                                 </group>
                             </group>
                         </form>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5aead3d086d..a9e5949a3ca 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
              ('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
-                                                'Show Time As', states={'done': [('readonly', True)]}),
+                                                'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'state': fields.selection([('tentative', 'Tentative'),
                         ('cancelled', 'Cancelled'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 46cfb098166..0340b4f11a6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
     <!-- Calendar Attendee Form View -->
+
     <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index f00b524a204..80e373160be 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -248,21 +248,6 @@
             </field>
         </record>
 
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_claim']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-        </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
@@ -270,15 +255,18 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='grp_claim']" position="inside">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_claim" string="Claim">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
                             </tree>
                         </field>
-                    </xpath>
-                </data>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 44a3d4613ec..c8760c0b07f 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -3,9 +3,9 @@
     <data>
 
          <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="view_speaker_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.speaker.info.inherit</field>
+
+       <record id="view_event_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -14,43 +14,31 @@
                     <field name="speaker"/>
                 </field>
                 <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                    <attribute name="invisible">False</attribute>
                 </xpath>
-                <xpath expr="//group[@name='grp_event']" position="attributes">
-                   <attribute name="invisible">False</attribute>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_event" string="Event">
+                        <field name="event_ids" colspan="4" nolabel="1">
+                            <tree string="Events">
+                                <field name="name" string="Event"/>
+                                <field name="main_speaker_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group name="grp_registration" string="Registration">
+                        <field name="event_registration_ids" colspan="4" nolabel="1">
+                            <tree string="Events Registration">
+                                <field name="event_begin_date" string="Date"/>
+                                <field name="event_id" />
+                                <field name="nb_register"/>
+                                <field name="state"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
-                <xpath expr="//group[@name='grp_registration']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-            </field>
-       </record>
-       <record id="view_event_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.event.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <group name="grp_event" position="inside">
-                    <field name="event_ids" colspan="4" nolabel="1">
-                        <tree string="Events">
-                            <field name="name" string="Event"/>
-                            <field name="main_speaker_id"/>
-                        </tree>
-                    </field>
-                   </group>
-                   <group name="grp_registration" position="inside">
-                    <field name="event_registration_ids" colspan="4" nolabel="1">
-                        <tree string="Events Registration">
-                            <field name="event_begin_date" string="Date"/>
-                            <field name="event_id" />
-                            <field name="nb_register"/>
-                            <field name="state"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                        </tree>
-                    </field>
-               </group>
             </field>
        </record>
 
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 38c51df58e0..627c2eacf04 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 2b1b9dc09dd..ee619f041e8 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -2,31 +2,21 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
-        <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-        <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
-           <field name="name">res.partner.crm.history.inherit2</field>
-           <field name="model">res.partner</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="base.view_partner_form"/>
-           <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_campaign']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-           </field>
-          </record>    
+         <!--  Partners inherited form -->  
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                    <group name="grp_campaign" position="inside">
-                            <field name="workitem_ids" colspan="4" nolabel="1"/>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_campaign" string="Campaign">
+                        <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
+                </xpath>
             </field>
        </record>
    </data>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 71d9bca3a71..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -242,10 +242,13 @@
                 <notebook position="inside">
                     <page string="Membership">
                         <group>
-                            <group col="3">
+                            <group>
                                 <field name="free_member"/>
-                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
-                                <field name="membership_state" class="oe_inline"/>
+                                <label for="membership_state"/>
+                                <div>
+                                    <field name="membership_state" class="oe_inline"/>
+                                    <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 052b49c5294..04e5dca32de 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -27,7 +27,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 8433824c268..1adb4fa5eda 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -33,8 +33,7 @@
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
-                      </separator>
-
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7610222d166..4fe51dc67f6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,9 +313,14 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="name"/>
                                 <field name="parent_id"/>
                             </group>
                             <group>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 3c2dde07376..09170c43434 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,39 +3,29 @@
     <data>
 
          <!--  Partners inherited form -->
-         <!-- TOFIX: set sequence into group instead of fix group in base.view_parter_form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-            <field name="name">res.partner.crm.history.inherit1</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//group[@name='grp_task']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-             </field>
-          </record>
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                   <group name="grp_task" position="inside">
-                    <field name="task_ids" colspan="4" nolabel="1">
-                        <tree string="Tasks" editable="bottom">
-                            <field name="name"/>
-                            <field name="user_id"/>
-                            <field name="date_deadline"/>
-                            <field name="state" invisible="1"/>
-                            <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                        </tree>
-                    </field>
-                  </group>
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_task" string="Tasks">
+                        <field name="task_ids" colspan="4" nolabel="1">
+                            <tree string="Tasks" editable="bottom">
+                                <field name="name"/>
+                                <field name="user_id"/>
+                                <field name="date_deadline"/>
+                                <field name="state" invisible="1"/>
+                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            </tree>
+                        </field>
+                      </group>
+                </xpath>
             </field>
        </record>
        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 668c48e1bf6..053f0e1765a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -874,7 +874,7 @@
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Add an internal note"/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>

From e1d6ecb015ce1db604eedc93048995ed74022664 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 19 Jul 2012 11:34:14 +0200
Subject: [PATCH 337/397] [IMP] sale, sale_margin: better name for <group> tag

bzr revid: qdp-launchpad@openerp.com-20120719093414-eqsw86hkj8qunxir
---
 addons/sale/sale_view.xml               | 2 +-
 addons/sale_margin/sale_margin_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1c41951d438..f7ab8fd748e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -262,7 +262,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <group name="sale_delivery">
+                            <group name="sale_margin_grp">
                             </group>
                             <div class="oe_clear">
                                 <label for="note"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index faac570e500..30c2a0dea14 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,7 +8,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_delivery']" position="inside">
+            <xpath expr="//group[@name='sale_margin_grp']" position="inside">
                 <group>
                     <label for="margin"/>
                     <div>

From 2a19e799d7489d254081692a80c6a3e86d93a366 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 19 Jul 2012 15:39:24 +0530
Subject: [PATCH 338/397] [IMP]: Place crm_meeting demo & data file at right
 location in base_calendar

bzr revid: cha@tinyerp.com-20120719100924-61t3jqsqzj61squb
---
 addons/base_calendar/__openerp__.py                |  5 +++--
 addons/{crm => base_calendar}/crm_meeting_data.xml |  0
 addons/{crm => base_calendar}/crm_meeting_demo.xml | 12 ++++++------
 addons/crm/__openerp__.py                          |  2 --
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%)
 rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca129f6f..c7df187dd87 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml'
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "demo_xml": [],
+    "demo_xml": ['crm_meeting_demo.xml'],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
similarity index 100%
rename from addons/crm/crm_meeting_data.xml
rename to addons/base_calendar/crm_meeting_data.xml
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
similarity index 89%
rename from addons/crm/crm_meeting_demo.xml
rename to addons/base_calendar/crm_meeting_demo.xml
index dda6d5a03a8..ad88c11bb1b 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet1"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..9fb1a4db28d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
-        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
-        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [

From 459ef0a9d9c2998550b3090ad238763daa40f058 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 19 Jul 2012 12:34:19 +0200
Subject: [PATCH 339/397] [FIX] crm: change the name of the action

bzr revid: stw@openerp.com-20120719103419-gtx93tuedw5imyah
---
 addons/crm/crm_lead_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index fde288c4a45..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunity</field>
+          <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>

From 9e0be9ffd17bf4f2293ef746274527ef5d8e8ea0 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 19 Jul 2012 16:41:15 +0530
Subject: [PATCH 340/397] [IMP]vat to tax : changed the label tax in lowercase

bzr revid: rpr@tinyerp.com-20120719111115-ap37b1bo2o7w1w1k
---
 addons/account/account.py                  | 20 ++++++++++----------
 addons/account/wizard/account_vat_view.xml |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ce6cba3edff..c95dbe253ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1882,15 +1882,15 @@ class account_tax(osv.osv):
         #
         # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2790,15 +2790,15 @@ class account_tax_template(osv.osv):
         #
         # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 6e5dc09b816..e1a5ea3b140 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a Tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a Tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem

From ce0b92a08b0be8c84da0c90708c44e5ab44ddc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 14:00:26 +0200
Subject: [PATCH 341/397] [IMP] mail.group: cleaned model. Now only have linked
 user groups, that automatically subscribe its users to the mail.group instead
 of broadcasting or anything else. Removed old fields, cleaned view. Added
 code for res.users and res.groups to handle user changes in groups,
 propagating them to the mail.group attached to the res.group.

bzr revid: tde@openerp.com-20120719120026-fi5o23cnh17kapgu
---
 addons/mail/mail_group.py       | 117 ++++++++++++--------------------
 addons/mail/mail_group_view.xml |  21 +-----
 addons/mail/res_users.py        |  38 +++++++++++
 3 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 98ee06918e8..9ed282acb0a 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -36,7 +36,7 @@ class mail_group(osv.osv):
     A mail_group is a collection of users sharing messages in a discussion
     group. Group users are users that follow the mail group, using the
     subscription/follow mechanism of OpenSocial. A mail group has nothing
-    in common wih res.users.group.
+    in common with res.users.group.
     Additional information on fields:
         - ``member_ids``: user member of the groups are calculated with
           ``message_get_subscribers`` method from mail.thread
@@ -110,37 +110,33 @@ class mail_group(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
         'responsible_id': fields.many2one('res.users', string='Responsible',
-                            ondelete='set null', required=True, select=1,
-                            help="Responsible of the group that has all rights on the record."),
+            ondelete='set null', required=True, select=1,
+            help="Responsible of the group that has all rights on the record."),
         'public': fields.boolean('Visible by non members', help='This group is visible by non members. \
-                            Invisible groups can add members through the invite button.'),
-        'models': fields.many2many('ir.model', rel='mail_group_ir_model_rel',
-                            id1='mail_group_id', id2='model_id',
-                            string='Linked models', help='Linked models'),
-        'groups': fields.many2many('res.groups', rel='mail_group_res_group_rel',
-                            id1='mail_group_id', id2='groups_id',
-                            string='Linked groups', help='Linked groups'),
-        'push_to_groups': fields.boolean('Push to groups', 
-                            help="When posting a comment on this mail_group, \
-                            the message is pushed to the users beloging to \
-                            the linked user groups."),
-        'photo_big': fields.binary('Full-size photo', help='Field holding \
-                            the full-sized PIL-supported and base64 encoded \
-                            version of the group image. The photo field is \
-                            used as an interface for this field.'),
-        'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Photo', type="binary",
+            Invisible groups can add members through the invite button.'),
+        'group_ids': fields.many2many('res.groups', rel='mail_group_res_group_rel',
+            id1='mail_group_id', id2='groups_id', string='Linked groups',
+            help="Members of those groups will automatically added as followers. "\
+                    "Note that they will be able to manage their subscription manually "\
+                    "if necessary."),
+        'photo_big': fields.binary('Full-size photo',
+            help='Field holding the full-sized PIL-supported and base64 encoded "\
+                    version of the group image. The photo field is used as an "\
+                    interface for this field.'),
+        'photo': fields.function(_get_photo, fnct_inv=_set_photo,
+            string='Photo', type="binary",
             store = {
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10),
-            }, help='Field holding the automatically resized (128x128) PIL-supported and base64 encoded version of the group image.'),
+            },
+            help='Field holding the automatically resized (128x128) PIL-supported and base64 encoded version of the group image.'),
         'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids,
-                            type='many2many', relation='res.users',
-                            string='Group members', multi='get_member_ids'),
+            type='many2many', relation='res.users', string='Group members', multi='get_member_ids'),
         'member_count': fields.function(get_member_ids, type='integer',
-                            string='Member count', multi='get_member_ids'),
+            string='Member count', multi='get_member_ids'),
         'is_subscriber': fields.function(get_member_ids, type='boolean',
-                            string='Joined', multi='get_member_ids'),
+            string='Joined', multi='get_member_ids'),
         'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer',
-                            string='Messages count for last month'),
+            string='Messages count for last month'),
     }
 
     _defaults = {
@@ -148,57 +144,30 @@ class mail_group(osv.osv):
         'responsible_id': (lambda s, cr, uid, ctx: uid),
         'photo': _get_default_photo,
     }
-    
-    def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        """ Overrider OpenChatter message_create_get_notification_user_ids
-            method. The purpose is to add to the subscribers users that 
-            belong to the res.groups linked to the mail.group through the 
-            groups field. The fields push_to_groups allows to control this 
-            feature.
-        """
-        notif_user_ids = super(mail_group, self).message_create_get_notification_user_ids(cr, uid, thread_ids, new_msg_vals, context=context)
-        for thread in self.browse(cr, uid, thread_ids, context=context):
-            if not thread.push_to_groups or not thread.groups:
-                continue
-            for group in thread.groups:
-                for user in group.users:
-                    notif_user_ids.append(user.id)
-        return list(set(notif_user_ids))
-        
-    def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        """ Override OpenChatter message_load method.
-            if models attribute is set: search all messages from that model
-            else: as usual
-        """
-        all_msg_ids = []
-        message_obj = self.pool.get('mail.message')
-        for group in self.browse(cr, uid, ids, context=context):
-            # call super to have default message ids
-            group_msg_ids = super(mail_group, self).message_load(cr, uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, False, True, context)
-            group_domain = ['&', ('model', '=', self._name), ('id', 'in', group_msg_ids)]
-            # if no linked domain: go on
-            if not group.models:
-                search_domain = group_domain
-            # add message ids linked to group models
-            else:
-                model_list = []
-                for model in group.models:
-                    model_list.append(model.model)
-                search_domain = [('|')] + group_domain
-                search_domain += [('model', 'in', model_list)]
-            # perform the search
-            msg_ids = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context)
-            if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
-            all_msg_ids += msg_ids
-        if count:
-            return len(all_msg_ids)
-        else:
-            return message_obj.read(cr, uid, all_msg_ids, context=context)
-    
+
+    def create(self, cr, uid, vals, context=None):
+        mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context)
+        if vals.get('group_ids'):
+            user_goup_ids = vals.get('group_ids')[0][2]
+            res_groups_obj = self.pool.get('res.groups')
+            user_ids = []
+            for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None):
+                user_ids += [user.id for user in group.users]
+            self.message_subscribe(cr, uid, [mail_group_id], user_ids, context=context)
+        return mail_group_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('group_ids'):
+            user_goup_ids = vals.get('group_ids')[0][2]
+            res_groups_obj = self.pool.get('res.groups')
+            user_ids = []
+            for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None):
+                user_ids += [user.id for user in group.users]
+            self.message_subscribe(cr, uid, ids, user_ids, context=context)
+        return super(mail_group, self).write(cr, uid, ids, vals, context=context)
+
     def action_group_join(self, cr, uid, ids, context=None):
         return self.message_subscribe(cr, uid, ids, context=context)
     
     def action_group_leave(self, cr, uid, ids, context=None):
         return self.message_unsubscribe(cr, uid, ids, context=context)
-    
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index f5443fcf0d7..c755209f952 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -64,6 +64,7 @@
                                 <newline/>
                                 <group colspan="4" col="4">
                                     <field name="description" colspan="4" nolabel="1"/>
+                                    <field name="group_ids" colspan="4" widget="many2many_tags" class="oe_edit_only"/>
                                 </group>
                                 <group colspan="2" col="2" class="oe_edit_only">
                                     <field name="responsible_id" colspan="2"/>
@@ -71,26 +72,6 @@
                                 </group>
                             </group>
                         </group>
-                        <div class="oe_edit_only">
-                            <group colspan="4" col="4">
-                                <group colspan="2" col="3">
-                                    <h3>Models for automatic message fetching</h3>
-                                    <field name="models" colspan="3" nolabel="1">
-                                        <tree string="Document models">
-                                            <field name="name"/>
-                                        </tree>
-                                    </field>
-                                </group>
-                                <group colspan="2" col="3">
-                                    <h3>User groups for message forwarding</h3>
-                                    <field name="groups" colspan="3" nolabel="1">
-                                        <tree string="Document groups">
-                                            <field name="name"/>
-                                        </tree>
-                                    </field>
-                                </group>
-                            </group>
-                        </div>
                     </sheet>
                     <div class="oe_chatter oe_mail_group_footer">
                         <field name="message_ids" widget="mail_thread"
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 5135fd31e35..9bb8a79a87f 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -80,3 +80,41 @@ class res_users(osv.osv):
                 custom_domain += ['|']
             custom_domain += ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
         return ['|'] + initial_domain + custom_domain
+
+class res_users_mail_group(osv.osv):
+    """ Update of res.groups class
+        - if adding/removing users from a group, check mail.groups linked to
+          this user group, and subscribe / unsubscribe them from the discussion
+          group. This is done by overriding the write method.
+    """
+    _name = 'res.users'
+    _inherit = ['res.users', 'mail.thread']
+
+    def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('groups_id'):
+            # form: {'groups_id': [(3, 10), (3, 3), (4, 10), (4, 3)]}
+            user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
+            mail_group_obj = self.pool.get('mail.group')
+            mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context)
+            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context)
+        return write_res
+        
+
+class res_groups_mail_group(osv.osv):
+    """ Update of res.groups class
+        - if adding/removing users from a group, check mail.groups linked to
+          this user group, and subscribe / unsubscribe them from the discussion
+          group. This is done by overriding the write method.
+    """
+    _name = 'res.groups'
+    _inherit = 'res.groups'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('users'):
+            # form: {'users': [(6, 0, [ids]}
+            user_ids = vals['users'][0][2]
+            mail_group_obj = self.pool.get('mail.group')
+            mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
+            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)
+        return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)

From 1984e6837c2018f43cfb5b5d95e489a41d57ebf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 14:01:56 +0200
Subject: [PATCH 342/397] [FIX] mail group data: fixed and cleaned data.

bzr revid: tde@openerp.com-20120719120156-nifroiplglxjd6ou
---
 addons/mail/data/mail_group_data.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 6cb2bec6ab1..11c259b3ee8 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -8,14 +8,10 @@
         </record>
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
-<!--
-            <field name="models" eval="[(4, ref('crm.lead'))]"/>
--->
         </record>
         <record model="mail.group" id="group_all_employees">
             <field name="name">All Employees</field>
-            <field name="push_to_groups" eval="True"/>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
         </record>
 
     </data>

From fb61d25873860e2afd59e37fa63e461ceb8efab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 14:03:11 +0200
Subject: [PATCH 343/397] [IMP] demo data: subtype -> content_subtype.

bzr revid: tde@openerp.com-20120719120311-d4eecei6g9k2dddo
---
 addons/mail/mail_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml
index 1adec42a910..6c25b59e35d 100644
--- a/addons/mail/mail_demo.xml
+++ b/addons/mail/mail_demo.xml
@@ -28,7 +28,7 @@
             <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Lorem ipsum dolor <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, varius a consequat id, consectetur sit amet nulla. 
 
@@ -44,7 +44,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
@@ -55,7 +55,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Agreed !  
 Would it be possible to learn more about the author ?  (second comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
@@ -78,7 +78,7 @@ Would it be possible to learn more about the author ?  (second comment)]]></fiel
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
 
 In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. 

From c6edc0158bf974cef328d7095d56cea7b5e1123c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 14:03:15 +0200
Subject: [PATCH 344/397] [IMP] mail: chatter: cleaned a bit the js code; added
 a refresh of internal records structure, that was causing some issues when
 loading more comments in record thrad.

bzr revid: tde@openerp.com-20120719120315-2sg2peifgh4hklvo
---
 addons/mail/mail_thread.py                    |  4 +-
 addons/mail/static/src/css/mail.css           |  2 +-
 addons/mail/static/src/js/mail.js             | 98 +++++++++----------
 .../mail/wizard/mail_compose_message_view.xml |  3 +-
 4 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a234fcfcf53..1f1a3d7223b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -498,15 +498,13 @@ class mail_thread(osv.Model):
         message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
             limit, offset, domain, context=context)
         messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
-        
+
         """ Retrieve all attachments names """
         map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids'])
-        print map_id_to_name
         map_id_to_name = {}
         for msg in messages:
             for attach_id in msg["attachment_ids"]:
                 map_id_to_name[attach_id] = '' # use empty string as a placeholder
-        print map_id_to_name
 
         ids = map_id_to_name.keys()
         names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 5593832549a..cf2f7d43a20 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -40,7 +40,7 @@
     width: 474px;
     height: 60px;
     padding: 4px;
-    margin-bottom: 8px;
+    margin-bottom: 2px;
 }
 
 .openerp ul.oe_mail_wall_threads {
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3ee88fbc37d..53f86fda893 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -15,11 +15,8 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
-
         do_action: function(action, on_close) {
-            if (action.res_model == 'mail.compose.message') {
-                console.log(this);
-                // debugger
+            if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids) {
                 var record_thread = this.fields.message_ids;
                 var thread = record_thread.thread;
                 thread.instantiate_composition_form('comment', true, false, 0, action.context);
@@ -55,26 +52,23 @@ openerp.mail = function(session) {
         */
         //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
 
-        do_bind_chatter_events: function(widget) {
-            // event: click on an internal link
-            widget.$element.delegate('a.oe_mail_oe_internal_link', 'click', function (event) {
+        /* generic chatter events binding */
+        bind_events: function(widget) {
+            // event: click on an internal link to a document: model, login
+            widget.$element.delegate('a.oe_mail_internal_link', 'click', function (event) {
                 event.preventDefault();
                 // lazy implementation: fetch data and try to redirect
                 if (! event.srcElement.dataset.resModel) return false;
                 else var res_model = event.srcElement.dataset.resModel;
                 var res_login = event.srcElement.dataset.resLogin;
-                var res_id = event.srcElement.dataset.resId;
-                if ((! res_login) && (! res_id)) return false;
-                if (! res_id) {
-                    var ds = new session.web.DataSet(widget, res_model);
-                    var defer = ds.call('search', [[['login', '=', res_login]]]).then(function (records) {
-                        if (records[0]) {
-                            widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
-                        }
-                        else return false;
-                    });
-                }
-                else widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
+                if (! res_login) return false;
+                var ds = new session.web.DataSet(widget, res_model);
+                var defer = ds.call('search', [[['login', '=', res_login]]]).pipe(function (records) {
+                    if (records[0]) {
+                        widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
+                    }
+                    else return false;
+                });
             });
         },
 
@@ -92,19 +86,19 @@ openerp.mail = function(session) {
         * Add records to comments_structure array
         * @param {Array} records records from mail.message sorted by date desc
         * @returns {Object} cs comments_structure: dict
-        *                      cs.model_to_root_ids = {model: [root_ids], }
-        *                      cs.new_root_ids = [new_root_ids]
-        *                      cs.root_ids = [root_ids]
-        *                      cs.msgs = {record.id: record,}
-        *                      cs.tree_struct = {record.id: {
-        *                          'level': record_level in hierarchy, 0 is root,
-        *                          'msg_nbr': number of childs,
-        *                          'direct_childs': [msg_ids],
-        *                          'all_childs': [msg_ids],
-        *                          'for_thread_msgs': [records],
-        *                          'ancestors': [msg_ids], } }
+        *       cs.model_to_root_ids = {model: [root_ids], }
+        *       cs.new_root_ids = [new_root_ids]
+        *       cs.root_ids = [root_ids]
+        *       cs.msgs = {record.id: record,}
+        *       cs.tree_struct = {record.id: {
+        *           'level': record_level in hierarchy, 0 is root,
+        *           'msg_nbr': number of childs,
+        *           'direct_childs': [msg_ids],
+        *           'all_childs': [msg_ids],
+        *           'for_thread_msgs': [records],
+        *           'ancestors': [msg_ids], } }
         */
-        sort_comments: function(cs, records, parent_id) {
+        records_struct_add_records: function(cs, records, parent_id) {
             var cur_iter = 0; var max_iter = 10; var modif = true;
             while ( modif && (cur_iter++) < max_iter) {
                 modif = false;
@@ -141,6 +135,14 @@ openerp.mail = function(session) {
             return cs;
         },
 
+        /* copy cs.new_root_ids into cs.root_ids */
+        records_struct_update_after_display: function(cs) {
+            // update TODO
+            cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
+            cs['new_root_ids'] = [];
+            return cs;
+        },
+
         /**
          *    CONTENT MANIPULATION
          * 
@@ -349,7 +351,6 @@ openerp.mail = function(session) {
                 'mail.compose.message.mode': this.params.mode,
             };
             var context = _.extend({}, this.params.context, widget_context);
-            // console.log(context);
             this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
             // find the id of the view to display in the chatter form
             var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
@@ -456,10 +457,10 @@ openerp.mail = function(session) {
             // update 'Post' button -> 'Send'
             // update 'Send an Email' link -> 'Post a comment'
             if (this.email_mode) {
-                this.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Send</span>');
+                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Send</span>');
                 this.$element.find('a.oe_mail_compose_message_email').html('Comment');
             } else {
-                this.$element.find('button.oe_form_button').html('<img width="16" height="16" src="http://localhost:8069/web/static/src/img/icons/gtk-ok.png"><span>Post</span>');
+                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Post</span>');
                 this.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
             }
             // toggle display
@@ -468,7 +469,7 @@ openerp.mail = function(session) {
 
         /**
          * Update the values of the composition form; with possible different
-           values for body_text and body_html. */
+         * values for body_text and body_html. */
         set_body_value: function(body_text, body_html) {
             this.form_view.fields.body_text.set_value(body_text);
             this.form_view.fields.body_html.set_value(body_html);
@@ -522,7 +523,7 @@ openerp.mail = function(session) {
             this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
             this.params.msg_more_limit = this.params.msg_more_limit || 150;
             this.params.limit = this.params.limit || 100;
-            this.params.limit = 3; // tmp for testing
+            // this.params.limit = 3; // tmp for testing
             this.params.offset = this.params.offset || 0;
             this.params.records = this.params.records || null;
             // datasets and internal vars
@@ -597,7 +598,7 @@ openerp.mail = function(session) {
         bind_events: function() {
             var self = this;
             // generic events from Chatter Mixin
-            mail.ChatterUtils.do_bind_chatter_events(this);
+            mail.ChatterUtils.bind_events(this);
             // event: click on 'more' at bottom of thread
             this.$element.find('button.oe_mail_button_more').click(function () {
                 self.do_more();
@@ -681,8 +682,9 @@ openerp.mail = function(session) {
             var defer = this.ds.call('message_read', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']),
                                     (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
-                else { self.display.show_more = true; records.pop(); }
-                
+                // else { self.display.show_more = true; records.pop(); }
+                // else { self.display.show_more = true; records.splice(0, 1); }
+                else { self.display.show_more = true; }
                 self.display_comments(records);
                 // TODO: move to customize display
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
@@ -704,10 +706,8 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-
-            // sort comments
-            mail.ChatterUtils.sort_comments(this.comments_structure, records, this.params.parent_id);
-
+            // sort the records
+            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
             for (var k in records) {
                 records[k].timerelative = $.timeago(records[k].date);
@@ -718,7 +718,6 @@ openerp.mail = function(session) {
                     }
                 }
             }
-
             _(records).each(function (record) {
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
@@ -740,6 +739,7 @@ openerp.mail = function(session) {
                     self.display_comment(record);
                 }
             });
+            mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
             // update offset for "More" buttons
             if (this.params.thread_level == 0) this.params.offset += records.length;
         },
@@ -783,14 +783,14 @@ openerp.mail = function(session) {
             var comment_node = this.$element.find('textarea');
             var body_text = comment_node.val();
             comment_node.val('');
-            return this.ds.call('message_append_note', [[this.params.res_id], 'Reply', body_text, this.params.parent_id, 'comment', 'html', 'comment']).then(
+            return this.ds.call('message_append_note', [[this.params.res_id], '', body_text, this.params.parent_id, 'comment', 'plain']).then(
                 this.proxy('init_comments'));
         },
         
         /**
          * Create a domain to fetch new comments according to
          * comment already present in comments_structure
-         * @param {Object} comments_structure (see sort_comments)
+         * @param {Object} comments_structure (see chatter utils)
          * @returns {Array} fetch_domain (OpenERP domain style)
          */
         get_fetch_domain: function (comments_structure) {
@@ -855,7 +855,7 @@ openerp.mail = function(session) {
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            mail.ChatterUtils.do_bind_chatter_events(this);
+            mail.ChatterUtils.bind_events(this);
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
             if (! this.params.see_subscribers_options) {
                 this.$element.find('button.oe_mail_button_followers').hide(); }
@@ -962,7 +962,7 @@ openerp.mail = function(session) {
          * @param {Object} [params]
          * @param {Number} [params.limit=20] number of messages to show and fetch
          * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} comments_structure see sort_comments
+         * @var {Array} comments_structure (see chatter utils)
          */
         init: function (parent, params) {
             this._super(parent);
@@ -1112,7 +1112,7 @@ openerp.mail = function(session) {
         display_comments: function (records) {
             var self = this;
             this.do_update_show_more(records.length >= self.params.limit);
-            mail.ChatterUtils.sort_comments(this.comments_structure, records, false);
+            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, false);
             _(this.comments_structure['new_root_ids']).each(function (root_id) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 2b69bf21dda..816cfddb555 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -57,7 +57,8 @@
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
                         <div>
-                            <button name="send_mail" string="Post" type="object"/>
+                            <button name="send_mail" string="Post" type="object"
+                                class="oe_mail_compose_message_button_send"/>
                             or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>

From 41fdcaf9949bec96b7abb3c13727d17076f40628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 14:34:39 +0200
Subject: [PATCH 345/397] [FIX] [REF] mail.group: refactored a bit the code
 about res.groups management and mail.group user update.

bzr revid: tde@openerp.com-20120719123439-81glrece7xm615ii
---
 addons/mail/mail_group.py | 27 +++++++++++++++------------
 addons/mail/res_users.py  |  8 +++++---
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 9ed282acb0a..ba8a53025e8 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -145,25 +145,28 @@ class mail_group(osv.osv):
         'photo': _get_default_photo,
     }
 
+    def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
+        print group_ids_command
+        # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+        user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
+        user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]]
+        # retrieve the user member of those groups
+        user_ids = []
+        res_groups_obj = self.pool.get('res.groups')
+        for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context):
+            user_ids += [user.id for user in group.users]
+        # subscribe the users
+        return self.message_subscribe(cr, uid, ids, user_ids, context=context)
+
     def create(self, cr, uid, vals, context=None):
         mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context)
         if vals.get('group_ids'):
-            user_goup_ids = vals.get('group_ids')[0][2]
-            res_groups_obj = self.pool.get('res.groups')
-            user_ids = []
-            for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None):
-                user_ids += [user.id for user in group.users]
-            self.message_subscribe(cr, uid, [mail_group_id], user_ids, context=context)
+            self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
         return mail_group_id
 
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('group_ids'):
-            user_goup_ids = vals.get('group_ids')[0][2]
-            res_groups_obj = self.pool.get('res.groups')
-            user_ids = []
-            for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None):
-                user_ids += [user.id for user in group.users]
-            self.message_subscribe(cr, uid, ids, user_ids, context=context)
+            self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context)
         return super(mail_group, self).write(cr, uid, ids, vals, context=context)
 
     def action_group_join(self, cr, uid, ids, context=None):
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 9bb8a79a87f..203854925d7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -93,8 +93,9 @@ class res_users_mail_group(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
-            # form: {'groups_id': [(3, 10), (3, 3), (4, 10), (4, 3)]}
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
             user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
+            user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context)
             mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context)
@@ -112,8 +113,9 @@ class res_groups_mail_group(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('users'):
-            # form: {'users': [(6, 0, [ids]}
-            user_ids = vals['users'][0][2]
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_ids = [command[1] for command in vals['users'] if command[0] == 4]
+            user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
             mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)

From 010622a368f9d9af71c01aa69f76d266c3327ecf Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 19 Jul 2012 14:35:27 +0200
Subject: [PATCH 346/397] [FIX] mail: feeds: Can't make a search on title

bzr revid: stw@openerp.com-20120719123527-tvknq8x7b85ccgv6
---
 addons/mail/mail_message_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 9159190ab29..34ba6db1477 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -73,6 +73,7 @@
                 <search string="Messages Search">
                     <field name="user_id"/>
                     <field name="body"/>
+                    <field name="model" string="Message" filter_domain="['|', ('subject', 'ilike', self), ('body_text', 'ilike', self)]" />
                 </search>
             </field>
         </record>

From f7dee95e6c2d9f3bb2c729c502af4e3ee0f3c1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 15:19:33 +0200
Subject: [PATCH 347/397] [CLEAN] hr_evaluation: removed unnecessary values in
 mail.compose.message override.

bzr revid: tde@openerp.com-20120719131933-ncrp9ru0kb2kfg5e
---
 addons/hr_evaluation/wizard/mail_compose_message.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
index 7b4c1b69164..7e4ba326947 100644
--- a/addons/hr_evaluation/wizard/mail_compose_message.py
+++ b/addons/hr_evaluation/wizard/mail_compose_message.py
@@ -44,15 +44,9 @@ class mail_compose_message(osv.osv_memory):
             if record_data.state == "waiting_answer":
                 msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
                 result.update({
-                        'email_from': tools.config.get('email_from',''),
                         'email_to': record_data.user_to_review_id.work_email or False,
                         'subject': _("Reminder to fill up Survey"),
                         'body_text': msg,
-                        'res_id': resource_id,
-                        'model': model,
-                        'email_cc': False,
-                        'email_bcc': False,
-                        'reply_to': False,
                     })
         return result
 

From e4677c76870ef5a64b7b26d72c65c7429aea8cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 15:56:09 +0200
Subject: [PATCH 348/397] [IMP] mail demo data: removed replies subjects.

bzr revid: tde@openerp.com-20120719135609-05upy1w3kbo2frix
---
 addons/mail/mail_demo.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml
index 6c25b59e35d..0a4751cedb1 100644
--- a/addons/mail/mail_demo.xml
+++ b/addons/mail/mail_demo.xml
@@ -41,7 +41,6 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
-            <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
@@ -52,7 +51,6 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
-            <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>
@@ -75,7 +73,6 @@ Would it be possible to learn more about the author ?  (second comment)]]></fiel
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
-            <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
             <field name="content_subtype">html</field>

From 6b9783629b214413cf4ddc3da00e365d90974cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 15:57:45 +0200
Subject: [PATCH 349/397] [IMP] mail: composition form: added partner form
 email templates; when sending an email, email_to is composed based on
 partner_ids also.

bzr revid: tde@openerp.com-20120719135745-b9ksd2adtrfdb2bm
---
 addons/email_template/email_template.py              | 7 +++++++
 addons/email_template/wizard/mail_compose_message.py | 2 ++
 addons/mail/mail_message.py                          | 9 ++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 16b66982d14..bf57342f14f 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -331,6 +331,13 @@ class email_template(osv.osv):
                                                  template.model, res_id, context=context) \
                                                  or False
 
+        # if email_to: find or create a partner
+        if values['email_to']:
+            partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
+            if not partner_id:
+                partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
+            values['partner_ids'] = [partner_id]
+
         if values['body_html']:
             values.update(content_subtype='html')
 
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 15fbeff20b0..410817dc06e 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -74,6 +74,8 @@ class mail_compose_message(osv.osv_memory):
             else:
                 # render the mail as one-shot
                 values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+                # get partner_ids back
+                values['dest_partner_ids'] = values['partner_ids']
                 # retrofit generated attachments in the expected field format
                 if values['attachments']:
                     attachment = values.pop('attachments')
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b7d887e4eed..564f81bf4a5 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -616,11 +616,18 @@ class mail_message(osv.Model):
                     body_alternative = message.body_text
                     content_subtype_alternative = 'plain'
 
+                # handle destination_partners
+                partner_ids_email_to = ''
+                for partner in message.partner_ids:
+                    partner_ids_email_to += '%s ' % (partner.email or '')
+                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
+                print message_email_to
+
                 # build an RFC2822 email.message.Message object adn send it
                 # without queuing
                 msg = ir_mail_server.build_email(
                     email_from=message.email_from,
-                    email_to=mail_tools_to_email(message.email_to),
+                    email_to=mail_tools_to_email(message_email_to),
                     subject=message.subject,
                     body=body,
                     body_alternative=body_alternative,

From 37f391a5645c93a86a656efe70761ec8e9e8d76f Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 19 Jul 2012 16:10:19 +0200
Subject: [PATCH 350/397] [FIX] Feeds header's layout

bzr revid: abo@openerp.com-20120719141019-p6ugjbsnt7wrfb03
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 982fb8aeb2f..ce15f83a3d4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_global">
+    <div t-name="mail.Wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
         <table class="oe_view_manager_header">
           <colgroup>
             <col width="33%"/>
@@ -9,7 +9,7 @@
             <col width="34%"/>
           </colgroup>
           <tbody>
-            <tr class="oe_header_row">
+            <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">All Feeds</span>

From 7e748858cd91cf8c4d6d287b320307671d3c1ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 16:12:01 +0200
Subject: [PATCH 351/397] [FIX] mail compose message: fixed body_html on
 quotation, fixed reference and header computation.

bzr revid: tde@openerp.com-20120719141201-32rl7t40qhzu0ylj
---
 addons/mail/wizard/mail_compose_message.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index c8ce25def0b..eea3a7eb46f 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -200,9 +200,9 @@ class mail_compose_message(osv.TransientModel):
         body_text = message_data.body_text or ''
         body_html = message_data.body_html or ''
         quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
-        quoted_body_html = '\n<blockquote>%s</blockquote>' % (body_html),
+        quoted_body_html = '<blockquote>%s</blockquote>' % {tools.ustr(body_html)},
         reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
-        reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature)
+        reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
         # form dest_partner_ids
         dest_partner_ids = [partner.id for partner in message_data.partner_ids]
         # Update header and references
@@ -210,12 +210,12 @@ class mail_compose_message(osv.TransientModel):
         reply_references = message_data.references and tools.ustr(message_data.references) or False
         reply_message_id = message_data.message_id or False
         if reply_message_id:
-            reply_references = (reply_references or '') + " " + mail_wiz.message_id
-            reply_headers['In-Reply-To'] = mail_wiz.message_id
+            reply_references = (reply_references or '') + " " + message_data.message_id
+            reply_headers['In-Reply-To'] = message_data.message_id
         # update the result
         result.update({
             'body_text': reply_body_text,
-            'body_html': quoted_body_html,
+            'body_html': reply_body_html,
             'subject': reply_subject,
             'attachment_ids': [],
             'dest_partner_ids': dest_partner_ids,

From 4b5bf16065d913f3e40f868d8d4243bd38c5a6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 16:12:14 +0200
Subject: [PATCH 352/397] [IMP] mail: chatter: html messages displayed as html.

bzr revid: tde@openerp.com-20120719141214-m5yyj74q65yoiruu
---
 addons/mail/static/src/js/mail.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 53f86fda893..3872a486565 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -754,7 +754,9 @@ openerp.mail = function(session) {
                 record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]);
             }
             // body text manipulation
-            record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
+            if (record.subtype == 'plain') {
+                record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
+            }
             record.body = mail.ChatterUtils.do_replace_expressions(record.body);
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});

From 667f3bc2297f298b2de83cc221e3aaa57d273b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 16:27:59 +0200
Subject: [PATCH 353/397] [DOC] res_partner: cleaned comments.

bzr revid: tde@openerp.com-20120719142759-uskridc98l3q7d1f
---
 openerp/addons/base/res/res_partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 469196fc06b..ee20298a6f3 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -303,8 +303,8 @@ class res_partner(osv.osv):
         return res
 
     def name_create(self, cr, uid, name, context=None):
-        """ Overrider of orm's name_create method for partners. The purpose is
-            to handle some basic syntaxic tricks to create partners using the
+        """ Override of orm's name_create method for partners. The purpose is
+            to handle some basic formats to create partners using the
             name_create.
             Supported syntax:
             - 'info@mail.com': create a partner with name info@mail.com, and

From 06fdb65695a2a98642ae92956f55d0c1cc395eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 17:03:49 +0200
Subject: [PATCH 354/397] [IMP] res_partner: improved regex used to find the
 email and name.

bzr revid: tde@openerp.com-20120719150349-6nkkq6h576tc6hyp
---
 openerp/addons/base/res/res_partner.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index ee20298a6f3..f739ea430b3 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -307,28 +307,28 @@ class res_partner(osv.osv):
             to handle some basic formats to create partners using the
             name_create.
             Supported syntax:
-            - 'info@mail.com': create a partner with name info@mail.com, and
-              sets its email to info@mail.com
+            - 'raoul@grosbedon.fr': create a partner with name raoul@grosbedon.fr
+              and sets its email to raoul@grosbedon.fr
             - 'Raoul Grosbedon <raoul@grosbedon.fr>': create a partner with name
               Raoul Grosbedon, and set its email to raoul@grosbedon.fr
             - anything else: fall back on the default name_create
             Regex :
-            - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com
-            - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul
-              Grosbedon, raoul, grosbedon.fr
+            - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}): raoul@grosbedon.fr
+            - ([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]:
+              Raoul Grosbedon, raoul@grosbedon.fr
         """
-        contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]')
-        email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)')
+        contact_regex = re.compile('([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]')
+        email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})')
         contact_regex_res = contact_regex.findall(name)
         email_regex_res = email_regex.findall(name)
         if contact_regex_res:
-            name = contact_regex_res[0][1]
-            name = name.rstrip(' ') # remove extra spaces on the right
-            email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3])
+            print contact_regex_res
+            name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right
+            email = contact_regex_res[0][1]
             rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);
             return self.name_get(cr, uid, [rec_id], context)[0]
         elif email_regex:
-            email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2])
+            email = '%s' % (email_regex_res[0])
             rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context);
             return self.name_get(cr, uid, [rec_id], context)[0]
         else:

From 81e6449e57269e9bfc9e0acdbff19f6657adef74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 17:07:25 +0200
Subject: [PATCH 355/397] [IMP] res_partner regex: added more support to the
 name.

bzr revid: tde@openerp.com-20120719150725-sas4xjbj492hv3pb
---
 openerp/addons/base/res/res_partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f739ea430b3..bf985d50f8a 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -314,10 +314,10 @@ class res_partner(osv.osv):
             - anything else: fall back on the default name_create
             Regex :
             - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}): raoul@grosbedon.fr
-            - ([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]:
+            - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]:
               Raoul Grosbedon, raoul@grosbedon.fr
         """
-        contact_regex = re.compile('([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]')
+        contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]')
         email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})')
         contact_regex_res = contact_regex.findall(name)
         email_regex_res = email_regex.findall(name)

From 8a56b182a89fe1a62634d16fd810b0072c5eb12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 17:11:54 +0200
Subject: [PATCH 356/397] [CLEAN] Removed some unnecessary code and comments.

bzr revid: tde@openerp.com-20120719151154-2u1rni4pxwik21o9
---
 addons/web/static/src/js/view_form.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 24182503b9b..c59af5a9307 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2318,7 +2318,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
                         "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
         });
         this.$cleditor = this.$textarea.cleditor()[0];
-        // call super now, because cleditor seems to reset the disable attr
+        // call super now, because cleditor resets the disable attr
         this._super.apply(this, arguments);
         if (this.$textarea.attr('disabled') == 'disabled') {
             this.$textarea.cleditor()[0].disable(true);
@@ -2334,16 +2334,11 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
     },
 
     render_value: function() {
-        var show_value = instance.web.format_value(this.get('value'), this, '');
-        this.$textarea.val(show_value);
-        if (show_value && this.view.options.resize_textareas) {
-            this.do_resize(this.view.options.resize_textareas);
-        }
+        this._super.apply(this, arguments);
         this.$cleditor.updateFrame();
     },
 
     get_value: function() {
-        // cleditor.updateTextArea();
         var value = this.$cleditor.$area.val();
         return value;
     },

From b3c5d4361b5bb98cf3253cd5e67a9c013be3709c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 17:43:00 +0200
Subject: [PATCH 357/397] [REM] Removed js library, moved into web decades ago.

bzr revid: tde@openerp.com-20120719154300-x1za0g4srxogt45k
---
 .../mail/static/src/js/jquery.expander.min.js | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 addons/mail/static/src/js/jquery.expander.min.js

diff --git a/addons/mail/static/src/js/jquery.expander.min.js b/addons/mail/static/src/js/jquery.expander.min.js
deleted file mode 100644
index 2c61251fcf0..00000000000
--- a/addons/mail/static/src/js/jquery.expander.min.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*!
- * jQuery Expander Plugin v1.4.2
- *
- * Date: Sat Mar 31 20:51:48 2012 EDT
- * Requires: jQuery v1.3+
- *
- * Copyright 2011, Karl Swedberg
- * Dual licensed under the MIT and GPL licenses (just like jQuery):
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- *
- *
- *
-*/
-(function(c){c.expander={version:"1.4.2",defaults:{slicePoint:100,preserveWords:true,widow:4,expandText:"read more",expandPrefix:"&hellip; ",expandAfterSummary:false,summaryClass:"summary",detailClass:"details",moreClass:"read-more",lessClass:"read-less",collapseTimer:0,expandEffect:"slideDown",expandSpeed:250,collapseEffect:"slideUp",collapseSpeed:200,userCollapse:true,userCollapseText:"read less",userCollapsePrefix:" ",onSlice:null,beforeExpand:null,afterExpand:null,onCollapse:null}};c.fn.expander=
-function(l){function J(a,d){var g="span",h=a.summary;if(d){g="div";if(x.test(h)&&!a.expandAfterSummary)h=h.replace(x,a.moreLabel+"$1");else h+=a.moreLabel;h='<div class="'+a.summaryClass+'">'+h+"</div>"}else h+=a.moreLabel;return[h,"<",g+' class="'+a.detailClass+'"',">",a.details,"</"+g+">"].join("")}function K(a){var d='<span class="'+a.moreClass+'">'+a.expandPrefix;d+='<a href="#">'+a.expandText+"</a></span>";return d}function y(a,d){if(a.lastIndexOf("<")>a.lastIndexOf(">"))a=a.slice(0,a.lastIndexOf("<"));
-if(d)a=a.replace(L,"");return c.trim(a)}function z(a,d){d.stop(true,true)[a.collapseEffect](a.collapseSpeed,function(){d.prev("span."+a.moreClass).show().length||d.parent().children("div."+a.summaryClass).show().find("span."+a.moreClass).show()})}function M(a,d,g){if(a.collapseTimer)A=setTimeout(function(){z(a,d);c.isFunction(a.onCollapse)&&a.onCollapse.call(g,false)},a.collapseTimer)}var v="init";if(typeof l=="string"){v=l;l={}}var o=c.extend({},c.expander.defaults,l),N=/^<(?:area|br|col|embed|hr|img|input|link|meta|param).*>$/i,
-L=o.wordEnd||/(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+)$/,B=/<\/?(\w+)[^>]*>/g,C=/<(\w+)[^>]*>/g,D=/<\/(\w+)>/g,x=/(<\/[^>]+>)\s*$/,O=/^<[^>]+>.?/,A;l={init:function(){this.each(function(){var a,d,g,h,m,i,p,w,E=[],t=[],q={},r=this,f=c(this),F=c([]),b=c.meta?c.extend({},o,f.data()):o;i=!!f.find("."+b.detailClass).length;var s=!!f.find("*").filter(function(){return/^block|table|list/.test(c(this).css("display"))}).length,u=(s?"div":"span")+"."+b.detailClass,G="span."+b.moreClass,P=b.expandSpeed||0,n=c.trim(f.html());
-c.trim(f.text());var e=n.slice(0,b.slicePoint);if(!c.data(this,"expander")){c.data(this,"expander",true);c.each(["onSlice","beforeExpand","afterExpand","onCollapse"],function(j,k){q[k]=c.isFunction(b[k])});e=y(e);for(d=e.replace(B,"").length;d<b.slicePoint;){a=n.charAt(e.length);if(a=="<")a=n.slice(e.length).match(O)[0];e+=a;d++}e=y(e,b.preserveWords);h=e.match(C)||[];m=e.match(D)||[];g=[];c.each(h,function(j,k){N.test(k)||g.push(k)});h=g;d=m.length;for(a=0;a<d;a++)m[a]=m[a].replace(D,"$1");c.each(h,
-function(j,k){var H=k.replace(C,"$1"),I=c.inArray(H,m);if(I===-1){E.push(k);t.push("</"+H+">")}else m.splice(I,1)});t.reverse();if(i){i=f.find(u).remove().html();e=f.html();n=e+i;a=""}else{i=n.slice(e.length);a=c.trim(i.replace(B,""));if(a===""||a.split(/\s+/).length<b.widow)return;a=t.pop()||"";e+=t.join("");i=E.join("")+i}b.moreLabel=f.find(G).length?"":K(b);if(s)i=n;e+=a;b.summary=e;b.details=i;b.lastCloseTag=a;if(q.onSlice)b=(g=b.onSlice.call(r,b))&&g.details?g:b;s=J(b,s);f.html(s);p=f.find(u);
-w=f.find(G);p.hide();w.find("a").unbind("click.expander").bind("click.expander",function(j){j.preventDefault();w.hide();F.hide();q.beforeExpand&&b.beforeExpand.call(r);p.stop(false,true)[b.expandEffect](P,function(){p.css({zoom:""});q.afterExpand&&b.afterExpand.call(r);M(b,p,r)})});F=f.find("div."+b.summaryClass);b.userCollapse&&!f.find("span."+b.lessClass).length&&f.find(u).append('<span class="'+b.lessClass+'">'+b.userCollapsePrefix+'<a href="#">'+b.userCollapseText+"</a></span>");f.find("span."+
-b.lessClass+" a").unbind("click.expander").bind("click.expander",function(j){j.preventDefault();clearTimeout(A);j=c(this).closest(u);z(b,j);q.onCollapse&&b.onCollapse.call(r,true)})}})},destroy:function(){if(this.data("expander")){this.removeData("expander");this.each(function(){var a=c(this),d=c.meta?c.extend({},o,a.data()):o,g=a.find("."+d.detailClass).contents();a.find("."+d.moreClass).remove();a.find("."+d.summaryClass).remove();a.find("."+d.detailClass).after(g).remove();a.find("."+d.lessClass).remove()})}}};
-l[v]&&l[v].call(this);return this};c.fn.expander.defaults=c.expander.defaults})(jQuery);

From fab43d4140781d6fca6b488243f5e1255677f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 17:56:41 +0200
Subject: [PATCH 358/397] [REM] Removed a print statement.

bzr revid: tde@openerp.com-20120719155641-a2ant2472swb3fhp
---
 openerp/addons/base/res/res_partner.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index bf985d50f8a..f3985c79552 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -322,7 +322,6 @@ class res_partner(osv.osv):
         contact_regex_res = contact_regex.findall(name)
         email_regex_res = email_regex.findall(name)
         if contact_regex_res:
-            print contact_regex_res
             name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right
             email = contact_regex_res[0][1]
             rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context);

From 642fc05be5f47afebad5ddac7003c569d47fc881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jul 2012 18:38:09 +0200
Subject: [PATCH 359/397] [CLEAN] mail.message: cleaned comments before merge.
 Also made an auto update of email_to field, based on partner_ids.

bzr revid: tde@openerp.com-20120719163809-3c6cex32rg0qo8y1
---
 addons/mail/mail_message.py | 74 ++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 564f81bf4a5..507f467e2cb 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -279,7 +279,7 @@ class mail_message(osv.Model):
         if default is None:
             default = {}
         self.check(cr, uid, [id], 'read', context=context)
-        default.update(message_id=False,original=False,headers=False)
+        default.update(message_id=False, original=False, headers=False)
         return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -291,38 +291,45 @@ class mail_message(osv.Model):
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False,
-                             email_cc=None, email_bcc=None, reply_to=False, attachments=None, partner_ids=None,
+                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
                              headers=None, mail_server_id=False, auto_delete=False, context=None):
-        """Schedule sending a new email message, to be sent the next time the mail scheduler runs, or
-           the next time :meth:`process_email_queue` is called explicitly.
-
-           :param string email_from: sender email address
-           :param list email_to: list of recipient addresses (to be joined with commas) 
-           :param string subject: email subject (no pre-encoding/quoting necessary)
-           :param string body: email body, according to the ``content_subtype`` 
-                               (by default, plaintext). If html content_subtype is used, the message will be automatically converted
-                               to plaintext and wrapped in multipart/alternative.
-           :param list email_cc: optional list of string values for CC header (to be joined with commas)
-           :param list email_bcc: optional list of string values for BCC header (to be joined with commas)
-           :param string model: optional model name of the document this mail is related to (this will also
-                                be used to generate a tracking id, used to match any response related to the
-                                same document)
-           :param int res_id: optional resource identifier this mail is related to (this will also
-                              be used to generate a tracking id, used to match any response related to the
-                              same document)
-           :param string reply_to: optional value of Reply-To header
-           :param string content_subtype: optional mime content_subtype for the text body (usually 'plain' or 'html'),
-                                       must match the format of the ``body`` parameter. Default is 'plain',
-                                       making the content part of the mail "text/plain".
-           :param dict attachments: map of filename to filecontents, where filecontents is a string
-                                    containing the bytes of the attachment
-           :param dict headers: optional map of headers to set on the outgoing mail (may override the
-                                other headers, including Subject, Reply-To, Message-Id, etc.)
-           :param int mail_server_id: optional id of the preferred outgoing mail server for this mail
-           :param bool auto_delete: optional flag to turn on auto-deletion of the message after it has been
-                                    successfully sent (default to False)
+        """ Schedule sending a new email message, to be sent the next time the
+            mail scheduler runs, or the next time :meth:`process_email_queue` is
+            called explicitly.
 
+            :param string email_from: sender email address
+            :param list email_to: list of recipient addresses (to be joined with commas) 
+            :param string subject: email subject (no pre-encoding/quoting necessary)
+            :param string body: email body, according to the ``content_subtype`` 
+                (by default, plaintext). If html content_subtype is used, the
+                message will be automatically converted to plaintext and wrapped
+                in multipart/alternative.
+            :param list email_cc: optional list of string values for CC header
+                (to be joined with commas)
+            :param list email_bcc: optional list of string values for BCC header
+                (to be joined with commas)
+            :param string model: optional model name of the document this mail
+                is related to (this will also be used to generate a tracking id,
+                used to match any response related to the same document)
+            :param int res_id: optional resource identifier this mail is related
+                to (this will also be used to generate a tracking id, used to
+                match any response related to the same document)
+            :param string reply_to: optional value of Reply-To header
+            :param partner_ids: destination partner_ids
+            :param string content_subtype: optional mime content_subtype for
+                the text body (usually 'plain' or 'html'), must match the format
+                of the ``body`` parameter. Default is 'plain', making the content
+                part of the mail "text/plain".
+            :param dict attachments: map of filename to filecontents, where
+                filecontents is a string containing the bytes of the attachment
+            :param dict headers: optional map of headers to set on the outgoing
+                mail (may override the other headers, including Subject,
+                Reply-To, Message-Id, etc.)
+            :param int mail_server_id: optional id of the preferred outgoing
+                mail server for this mail
+            :param bool auto_delete: optional flag to turn on auto-deletion of
+                the message after it has been successfully sent (default to False)
         """
         if context is None:
             context = {}
@@ -336,7 +343,7 @@ class mail_message(osv.Model):
                 param = [param]
         msg_vals = {
                 'subject': subject,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'date': fields.datetime.now(),
                 'user_id': uid,
                 'model': model,
                 'res_id': res_id,
@@ -621,7 +628,6 @@ class mail_message(osv.Model):
                 for partner in message.partner_ids:
                     partner_ids_email_to += '%s ' % (partner.email or '')
                 message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
-                print message_email_to
 
                 # build an RFC2822 email.message.Message object adn send it
                 # without queuing
@@ -644,9 +650,9 @@ class mail_message(osv.Model):
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res})
+                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
                 else:
-                    message.write({'state':'exception'})
+                    message.write({'state':'exception', 'email_to': message_email_to})
                 message.refresh()
                 if message.state == 'sent':
                     self._postprocess_sent_message(cr, uid, message, context=context)

From ad9f16238d8122d1d07470cc445ebb946359b41d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Jul 2012 04:45:32 +0000
Subject: [PATCH 360/397] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120720043734-rqxoubj45utde2nb
bzr revid: launchpad_translations_on_behalf_of_openerp-20120720044532-0x70lsjeu7dcpj56
---
 addons/web/i18n/ja.po           |   4 +-
 addons/web_calendar/i18n/ja.po  |   4 +-
 addons/web_dashboard/i18n/ja.po |   4 +-
 addons/web_diagram/i18n/ja.po   |   4 +-
 addons/web_gantt/i18n/hu.po     |  28 ++++++++
 addons/web_gantt/i18n/ja.po     |   4 +-
 addons/web_graph/i18n/hu.po     |  98 ++++++++++++++++++++++++++
 addons/web_graph/i18n/ja.po     |   4 +-
 addons/web_kanban/i18n/hu.po    |  66 ++++++++++++++++++
 addons/web_kanban/i18n/ja.po    |   4 +-
 addons/web_mobile/i18n/ja.po    |   4 +-
 addons/web_process/i18n/hu.po   | 118 ++++++++++++++++++++++++++++++++
 addons/web_process/i18n/ja.po   |   4 +-
 openerp/addons/base/i18n/ja.po  |  38 +++++-----
 14 files changed, 347 insertions(+), 37 deletions(-)
 create mode 100644 addons/web_gantt/i18n/hu.po
 create mode 100644 addons/web_graph/i18n/hu.po
 create mode 100644 addons/web_kanban/i18n/hu.po
 create mode 100644 addons/web_process/i18n/hu.po

diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index c1339863a4d..41154a91a72 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 00ea538f586..e950529be81 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_dashboard/i18n/ja.po b/addons/web_dashboard/i18n/ja.po
index 6b59633054b..c3e73cebb9d 100644
--- a/addons/web_dashboard/i18n/ja.po
+++ b/addons/web_dashboard/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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/js/dashboard.js:60
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index bd1625fe9df..9897259683c 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
new file mode 100644
index 00000000000..7fe1cce2631
--- /dev/null
+++ b/addons/web_gantt/i18n/hu.po
@@ -0,0 +1,28 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:30+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-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr ""
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Létrehozás"
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index d16a0e5452f..29dee705455 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
new file mode 100644
index 00000000000..b3b7b0a864d
--- /dev/null
+++ b/addons/web_graph/i18n/hu.po
@@ -0,0 +1,98 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:27+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-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Grafikon"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 7fa475e3bcb..6952acbbc5d 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
new file mode 100644
index 00000000000..54814691329
--- /dev/null
+++ b/addons/web_kanban/i18n/hu.po
@@ -0,0 +1,66 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:26+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-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Kanban"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:293
+msgid "Undefined"
+msgstr "Nem definiált"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:468
+msgid "Are you sure you want to delete this record ?"
+msgstr "Biztosan törölni szeretné ezt a bejegyzést?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:839
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:72
+msgid "Cancel"
+msgstr ""
+
+#~ msgid "Create"
+#~ msgstr "Létrehozás"
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 440a2e15fbd..51a1a1559bf 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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 9be55cb112a..82f05b3282d 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po
new file mode 100644
index 00000000000..d37cd5543e7
--- /dev/null
+++ b/addons/web_process/i18n/hu.po
@@ -0,0 +1,118 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:28+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-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Mentés"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Olvassa a dokumentációt online"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Fórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Közösségi vitafórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Könyvek"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Megjegyzések:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Utoljára módosította:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Alfolyamatok:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Kapcsolódó:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Folyamat kiválasztása"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Kiválaszt"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr ""
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index 4cc24782acb..22db0acff5e 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/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-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 0e756def3ee..f4d05595b25 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-07-08 22:23+0000\n"
+"PO-Revision-Date: 2012-07-19 05:44+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-19 04:40+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:37+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -459,7 +459,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr "ウィジット"
+msgstr "ウィジェット"
 
 #. module: base
 #: view:ir.model.access:0
@@ -2514,7 +2514,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr "ホームページウィジット管理"
+msgstr "ホームページウィジェット管理"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -2782,7 +2782,7 @@ msgstr "インポート / エクスポート"
 #. module: base
 #: model:ir.actions.todo.category,name:base.category_tools_customization_config
 msgid "Tools / Customization"
-msgstr "ツール / カスタマイゼーション"
+msgstr "ツール / カスタム化"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -2895,7 +2895,7 @@ msgstr "マネジャ"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr "カスタマイゼーション"
+msgstr "カスタム化"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -7797,7 +7797,7 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr "ウィジットウィザード"
+msgstr "ウィジェットウィザード"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -12068,7 +12068,7 @@ msgstr ""
 "このモジュールはパートナのアドレスの中にGoogleマップ項目を追加します。\n"
 "====================================================\n"
 "\n"
-"これを使うと、URLウィジットからGoogleマップを直接開くことができます。"
+"これを使うと、URLウィジェットからGoogleマップを直接開くことができます。"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -14297,7 +14297,7 @@ msgstr "連絡先を隠すためにはアクティブな項目のチェックを
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr "ユーザのウィジットを追加"
+msgstr "ユーザのウィジェットを追加"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -15305,7 +15305,7 @@ msgstr "イラン"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr "ユーザ当りのウィジット"
+msgstr "ユーザ当りのウィジェット"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
@@ -15579,7 +15579,7 @@ msgstr "情報"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr "ユーザウィジット"
+msgstr "ユーザウィジェット"
 
 #. module: base
 #: view:base.module.update:0
@@ -17621,7 +17621,7 @@ msgstr "機能"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr "ウィジットの検索"
+msgstr "ウィジェットの検索"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
@@ -17742,7 +17742,7 @@ msgstr "受発注のドキュメントの内容に応じて、自動的に正し
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr "ホームページウィジット"
+msgstr "ホームページウィジェット"
 
 #. module: base
 #: help:res.company,rml_footer2:0
@@ -17815,23 +17815,23 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
+"このモジュールは何の開発もなしに新しいモジュールの作成ができます。\n"
 "======================================================================\n"
 "\n"
 "これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
 ".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
 "独自モジュールを作成することができます。\n"
 "\n"
-"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
-"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
+"このバージョンは作成と既存のレコードの更新のために動作します。それは依存関係と、\n"
+"全てのウィジェットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
 "また、ワークフローとデモ / 更新データもサポートします。\n"
 "\n"
 "カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
 "作成するために役立つはずです。\n"
 "\n"
 "利用方法：\n"
-"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
-"作成/エクスポート カスタマイゼーション を実行します。\n"
+"モジュールウィザードの アドミニストレーション/カスタム化/モジュール \n"
+"作成/エクスポート カスタム化 を実行します。\n"
 "記録の日時の基準、記録されるオブジェクト、記録モジュールを選択します。\n"
 "    "
 

From 7eb49260d163fb6a79e25208f24339cf0933dc3d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 09:34:59 +0200
Subject: [PATCH 361/397] [REVERT] previous merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
---
 addons/base_calendar/__openerp__.py                |  5 ++---
 addons/crm/__openerp__.py                          |  2 ++
 addons/{base_calendar => crm}/crm_meeting_data.xml |  0
 addons/{base_calendar => crm}/crm_meeting_demo.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename addons/{base_calendar => crm}/crm_meeting_data.xml (100%)
 rename addons/{base_calendar => crm}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index c7df187dd87..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,10 +39,9 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml',
-        'crm_meeting_data.xml',
+        'base_calendar_data.xml'
     ],
-    "demo_xml": ['crm_meeting_demo.xml'],
+    "demo_xml": [],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9fb1a4db28d..0c9b75b4d41 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,6 +68,7 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
+        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -114,6 +115,7 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
similarity index 100%
rename from addons/base_calendar/crm_meeting_data.xml
rename to addons/crm/crm_meeting_data.xml
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
similarity index 89%
rename from addons/base_calendar/crm_meeting_demo.xml
rename to addons/crm/crm_meeting_demo.xml
index ad88c11bb1b..dda6d5a03a8 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
+            <field name="categ_id" ref="crm.categ_meet1"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>

From 9cfa2908b89e0ab4c1c531ada0b4d4518a5849a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 10:25:49 +0200
Subject: [PATCH 362/397] [FIX] mail_compose_message: lost '{'.

bzr revid: tde@openerp.com-20120720082549-2z2feyuk37xrlqtw
---
 addons/mail/wizard/mail_compose_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index eea3a7eb46f..de3e5ca39ba 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -200,7 +200,7 @@ class mail_compose_message(osv.TransientModel):
         body_text = message_data.body_text or ''
         body_html = message_data.body_html or ''
         quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
-        quoted_body_html = '<blockquote>%s</blockquote>' % {tools.ustr(body_html)},
+        quoted_body_html = '<blockquote>%s</blockquote>' % (tools.ustr(body_html)),
         reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
         reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
         # form dest_partner_ids

From 86e5835728bdd1a0be071f77eb5d208d2e028897 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 20 Jul 2012 11:23:27 +0200
Subject: [PATCH 363/397] [IMP] module kanban: remove unnecessary line break

bzr revid: rco@openerp.com-20120720092327-1j9777ss4n85c4og
---
 openerp/addons/base/module/module_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 6f08e8c4e3d..bd74abfa92d 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -80,7 +80,7 @@
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
-                             <i><field name="name" groups="base.group_no_one"/></i><br/>
+                             <i><field name="name" groups="base.group_no_one"/></i>
                           </p>
                           <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
                           <button t-if="installed" disabled="disabled">Installed</button>

From bb64a121e74919fe387176784cf8e4a20e4e0490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 11:25:45 +0200
Subject: [PATCH 364/397] [CLEAN] mail.message: cleaned comments and
 formatting, added parent_id and child_ids to mail.message model;
 mail.message.common only have a parent_id field now.

bzr revid: tde@openerp.com-20120720092545-gouxtlg9b6frehm1
---
 addons/mail/mail_message.py | 85 +++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 507f467e2cb..b2104322da6 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -57,13 +57,13 @@ def to_email(text):
     return mail_tools_to_email(text)
 
 class mail_message_common(osv.TransientModel):
-    """Common abstract class for holding the main attributes of a 
-       message object. It could be reused as parent model for any
-       database model or wizard screen that needs to hold a kind of
-       message.
-       All internal logic should be in a database-based model while this
-       model holds the basics of a message. For example, a wizard for writing
-       emails should inherit from this class and not from mail.message."""
+    """ Common abstract class for holding the main attributes of a 
+        message object. It could be reused as parent model for any
+        database model or wizard screen that needs to hold a kind of
+        message.
+        All internal logic should be in another model while this
+        model holds the basics of a message. For example, a wizard for writing
+        emails should inherit from this class and not from mail.message."""
 
     def get_body(self, cr, uid, ids, name, arg, context=None):
         """ get correct body version: body_html for html messages, and
@@ -132,11 +132,13 @@ class mail_message_common(osv.TransientModel):
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, type='text',
             string='Message Content', store=True,
-            help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
-        'parent_id': fields.many2one('mail.message', 'Parent Message',
+            help="Content of the message. This content equals the body_text field "\
+                 "for plain-test messages, and body_html for rich-text/HTML "\
+                 "messages. This allows having one field if we want to access "\
+                 "the content matching the message content_subtype."),
+        'parent_id': fields.many2one('mail.message.common', 'Parent Message',
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
-        'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
     }
 
     _defaults = {
@@ -149,24 +151,22 @@ class mail_message(osv.Model):
        notifications), comments (for OpenChatter feature) and
        RFC2822 email messages. This model also provides facilities to
        parse, queue and send new email messages. Type of messages
-       are differentiated using the 'type' column.
-       
-       The ``display_text`` field will have a slightly different
-       presentation for real emails and for log messages."""
+       are differentiated using the 'type' column. """
 
     _name = 'mail.message'
     _inherit = 'mail.message.common'
     _description = 'Mail Message (email, comment, notification)'
     _order = 'date desc'
 
-    # XXX to review - how to determine action to use?
     def open_document(self, cr, uid, ids, context=None):
+        """ Open the message related document. Note that only the document of
+            ids[0] will be opened.
+            TODO: how to determine the action to use ?
+        """
         action_data = False
         if not ids:
             return action_data
-        # works only on 1 item
-        id = ids[0]
-        msg = self.browse(cr, uid, id, context=context)
+        msg = self.browse(cr, uid, ids[0], context=context)
         ir_act_window = self.pool.get('ir.actions.act_window')
         action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context)
         if action_ids:
@@ -178,14 +178,16 @@ class mail_message(osv.Model):
                     })
         return action_data
 
-    # XXX to review - how to determine action to use?
     def open_attachment(self, cr, uid, ids, context=None):
+        """ Open the message related attachments.
+            TODO: how to determine the action to use ?
+        """
         action_data = False
         if not ids:
             return action_data
         action_pool = self.pool.get('ir.actions.act_window')
         messages = self.browse(cr, uid, ids, context=context)
-        att_ids = [x.id for x in message.attachment_ids for message in messages]
+        att_ids = [x.id for message in messages for x in message.attachment_ids]
         action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context)
         if action_ids:
             action_data = action_pool.read(cr, uid, action_ids[0], context=context)
@@ -200,13 +202,11 @@ class mail_message(osv.Model):
                         ('email', 'email'),
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
-                        ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"),
-        'subtype': fields.char('Subtype', size=64,
-                        help="Message subtype, such as 'create' or 'cancel'. The purpose \
-                        is to be able to distinguish message of the same type.\
-                        For example, it is used to add the possibility to hide \
-                        notifications in the wall."),
-        'partner_id': fields.many2one('res.partner', 'Related partner'),
+                        ], 'Type',
+            help="Message type: email for email message, notification for system "\
+                  "message, comment for other messages such as user replies"),
+        'partner_id': fields.many2one('res.partner', 'Related partner',
+            help="Deprecated field. Use partner_ids instead."),
         'partner_ids': fields.many2many('res.partner',
             'mail_message_destination_partner_rel',
             'message_id', 'partner_id', 'Destination partners',
@@ -222,13 +222,18 @@ class mail_message(osv.Model):
                         ('exception', 'Delivery Failed'),
                         ('cancel', 'Cancelled'),
                         ], 'Status', readonly=True),
-        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
-        'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1),
+        'auto_delete': fields.boolean('Auto Delete',
+            help="Permanently delete this email after sending it, to save space"),
+        'original': fields.binary('Original', readonly=1,
+            help="Original version of the message, as it was sent on the network"),
+        'parent_id': fields.many2one('mail.message', 'Parent Message',
+            select=True, ondelete='set null',
+            help="Parent message, used for displaying as threads with hierarchy"),
+        'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
     }
         
     _defaults = {
         'type': 'email',
-        'subtype': 'email',
         'state': 'received',
     }
     
@@ -382,7 +387,10 @@ class mail_message(osv.Model):
         return email_msg_id
 
     def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context)
+        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
+
+    def cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
 
     def process_email_queue(self, cr, uid, ids=None, context=None):
         """Send immediately queued messages, committing after each
@@ -582,10 +590,9 @@ class mail_message(osv.Model):
         """
         if message.auto_delete:
             self.pool.get('ir.attachment').unlink(cr, uid,
-                                                  [x.id for x in message.attachment_ids \
-                                                        if x.res_model == self._name and \
-                                                           x.res_id == message.id],
-                                                  context=context)
+                [x.id for x in message.attachment_ids
+                    if x.res_model == self._name and x.res_id == message.id],
+                context=context)
             message.unlink()
         return True
 
@@ -604,8 +611,6 @@ class mail_message(osv.Model):
                                     transactions (default: False)
            :return: True
         """
-        if context is None:
-            context = {}
         ir_mail_server = self.pool.get('ir.mail_server')
         self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
         for message in self.browse(cr, uid, ids, context=context):
@@ -629,7 +634,7 @@ class mail_message(osv.Model):
                     partner_ids_email_to += '%s ' % (partner.email or '')
                 message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
 
-                # build an RFC2822 email.message.Message object adn send it
+                # build an RFC2822 email.message.Message object and send it
                 # without queuing
                 msg = ir_mail_server.build_email(
                     email_from=message.email_from,
@@ -664,8 +669,6 @@ class mail_message(osv.Model):
                 cr.commit()
         return True
 
-    def cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return True
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 58da4f7688b6bbdd229cce8be3aff387955ebbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 11:26:20 +0200
Subject: [PATCH 365/397] [REF] mail: res.partner inheritance: removed
 unnecessary 'emails' column, as this is managed by Chatter. Also updated
 partner_id -> partner_ids.

bzr revid: tde@openerp.com-20120720092620-o94cxdi2hxthd5y1
---
 addons/mail/res_partner.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index ceb90041142..aeec9a5a6b3 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -22,21 +22,18 @@
 from osv import osv
 from osv import fields
 
-class res_partner(osv.osv):
+class res_partner_mail(osv.osv):
     """ Inherits partner and adds CRM information in the partner form """
     _name = "res.partner"
     _inherit = ['res.partner', 'mail.thread']
-    _columns = {
-        'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]),
-    }
 
     def message_search_get_domain(self, cr, uid, ids, context=None):
         """ Override of message_search_get_domain for partner discussion page.
             The purpose is to add messages directly sent to the partner.
         """
-        initial_domain = super(res_partner, self).message_search_get_domain(cr, uid, ids, context=context)
+        initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
         if self._name == 'res.partner': # to avoid models inheriting from res.partner
-            search_domain = ['|'] + initial_domain + [('partner_id', 'in', ids)]
+            search_domain = ['|'] + initial_domain + [('partner_ids', 'in', ids)]
         return search_domain
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From dee772d423934d682f9691f48115fcd56aea432b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 20 Jul 2012 11:30:46 +0200
Subject: [PATCH 366/397] [FIX] in summary of modules: typos

bzr revid: rco@openerp.com-20120720093046-92l51ts5aaee9etq
---
 addons/event/__openerp__.py          | 2 +-
 addons/hr_holidays/__openerp__.py    | 2 +-
 addons/hr_recruitment/__openerp__.py | 2 +-
 addons/mrp/__openerp__.py            | 2 +-
 addons/point_of_sale/__openerp__.py  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 919cfb5846b..feb77249cbb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -25,7 +25,7 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'summary': 'Invitation, Subscription',
+    'summary': 'Invitations, Subscriptions',
     'description': """
 Organization and management of Events.
 ======================================
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index d1559dedec1..b37dd3c7859 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -26,7 +26,7 @@
     "author": "OpenERP SA",
     "category": "Human Resources",
     "sequence": 28,
-    "summary": "Allocation and Leaves Requests, Reporting by Department",
+    "summary": "Allocation and Leave Requests, Reporting by Department",
     "website": "http://www.openerp.com",
     "description": """
 This module allows you to manage leaves and leaves' requests.
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 3784185d83c..fe6c86c684d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     "sequence": 24,
-    "summary": "Job Description, Recruitment Process",
+    "summary": "Job Descriptions, Recruitment Process",
     'description': """
 Manages job positions and the recruitment process.
 ==================================================
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 826175bfd56..d1f5625e09f 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -27,7 +27,7 @@
     "website" : "http://www.openerp.com",
     "category" : "Manufacturing",
     "sequence": 18,
-    "summary": "Manufacture, Production, Bill of Material",
+    "summary": "Manufacturing, Production, Bill of Materials",
     "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 31d03195357..7d556ffaf0e 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     "sequence": 6,
-    "summary": "Touchscreen to manage your shop",
+    "summary": "Touchscreen to Manage your Shop",
     'description': """
 This module provides a quick and easy sale process.
 ===================================================

From 7ab67eb72da9c4bc5a7d4977dbf1e228eb4db04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 11:49:29 +0200
Subject: [PATCH 367/397] [IMP] mail.message view: cleaned short view for
 feeds.

bzr revid: tde@openerp.com-20120720094929-wite8l21xa60v33n
---
 addons/mail/mail_message_view.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 151b2558480..634b5317d27 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -34,16 +34,22 @@
                                 <field name="date"/>
                                 <field name="type"/>
                                 <field name="content_subtype"/>
-                                <field name="partner_ids" widget="many2many_tags"/>
                             </group>
                             <group>
                                 <field name="model"/>
                                 <field name="res_id"/>
                                 <field name="parent_id"/>
-                                <field name="body_text"/>
-                                <field name="body_html"/>
+                                <field name="partner_ids" widget="many2many_tags"/>
                             </group>
                         </group>
+                        <notebook>
+                            <page string="Body (Rich)">
+                                <field name="body_html" widget="text_html"/>
+                            </page>
+                            <page string="Body (Plain)">
+                                <field name="body_text" widget="text"/>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

From a5648e75d83f474422179eb1092b9b97055a9176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 11:57:19 +0200
Subject: [PATCH 368/397] [IMP] mail.mesage: scheduler: try to send only
 outgoing emails.

bzr revid: tde@openerp.com-20120720095719-0qmigezuv7r6gr3d
---
 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 b2104322da6..8553566a6d1 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -409,7 +409,7 @@ class mail_message(osv.Model):
         if context is None:
             context = {}
         if not ids:
-            filters = [('state', '=', 'outgoing')]
+            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
             if 'filters' in context:
                 filters.extend(context['filters'])
             ids = self.search(cr, uid, filters, context=context)

From 150b0fccd1bf5489eb62b81dc02f1420a3c39f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 12:17:56 +0200
Subject: [PATCH 369/397] [REM] mail.message: schedule with attach: removed
 type=email, because this is the default value.

bzr revid: tde@openerp.com-20120720101756-slv9kd6r5a3d9qrw
---
 addons/mail/mail_message.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 8553566a6d1..2443a5b8eca 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -352,7 +352,6 @@ class mail_message(osv.Model):
                 'user_id': uid,
                 'model': model,
                 'res_id': res_id,
-                'type': 'email',
                 'body_text': body if content_subtype != 'html' else False,
                 'body_html': body if content_subtype == 'html' else False,
                 'email_from': email_from,

From 49acfe69785efa7779dbe7409e7d4aab95122650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 12:21:03 +0200
Subject: [PATCH 370/397] [MOV] mail_demo moved to data/mail_demo.

bzr revid: tde@openerp.com-20120720102103-4ls3yb0s7z27m4t6
---
 addons/mail/__openerp__.py           | 2 +-
 addons/mail/{ => data}/mail_demo.xml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/mail/{ => data}/mail_demo.xml (100%)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 47256cd5730..6ad9ae91a53 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -100,7 +100,7 @@ The main features of the module are :
         'static/src/xml/mail.xml',
     ],
     'demo': [
-        'mail_demo.xml',
+        'data/mail_demo.xml',
     ],   
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_demo.xml b/addons/mail/data/mail_demo.xml
similarity index 100%
rename from addons/mail/mail_demo.xml
rename to addons/mail/data/mail_demo.xml

From 10e64ed7ebc95ce35c549d3b87883af8eba42a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 12:24:35 +0200
Subject: [PATCH 371/397] [IMP] res.users, res.partner: chatter in correct
 'footer' style.

bzr revid: tde@openerp.com-20120720102435-v20b8jnwum6uvm84
---
 addons/mail/res_partner_view.xml | 2 +-
 addons/mail/res_users_view.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 8b4d89f89f4..d1e2d881739 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <div class="oe_chatter">
+                    <div class="oe_chatter oe_mail_group_footer">
                         <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
                     </div>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index bd8041b3f1c..e268997ac2c 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,9 +27,9 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <footer>
+                    <div class="oe_chatter oe_mail_group_footer">
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
+                    </div>
                 </xpath>
             </data>
             </field>

From f4baf23f07dde32eda9aca152ab9381fe9ab4817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 12:29:04 +0200
Subject: [PATCH 372/397] [REM] [ADD] Removed old unused icons; added icons for
 composer.

bzr revid: tde@openerp.com-20120720102904-jkwhlt1fgvf1ywja
---
 addons/mail/__openerp__.py                 |   5 +++--
 addons/mail/static/src/img/_fp.png         | Bin 7725 -> 0 bytes
 addons/mail/static/src/img/feeds-hover.png | Bin 15696 -> 0 bytes
 addons/mail/static/src/img/feeds.png       | Bin 5647 -> 0 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 addons/mail/static/src/img/_fp.png
 delete mode 100644 addons/mail/static/src/img/feeds-hover.png
 delete mode 100644 addons/mail/static/src/img/feeds.png

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 6ad9ae91a53..6247e894661 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -83,9 +83,10 @@ The main features of the module are :
         'static/src/img/email_icong.png',
         'static/src/img/_al.png',
         'static/src/img/_pincky.png',
-        'static/src/img/feeds.png',
-        'static/src/img/feeds-hover.png',
         'static/src/img/groupdefault.png',
+        'static/src/img/attachment.png',
+        'static/src/img/checklist.png',
+        'static/src/img/formatting.png',
     ],
     'css': [
         'static/src/css/mail.css',
diff --git a/addons/mail/static/src/img/_fp.png b/addons/mail/static/src/img/_fp.png
deleted file mode 100644
index 17dce2a047c386c1cf1c16074254839717369085..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7725
zcmV+|9@627P)<h;3K|Lk000e1NJLTq003YB002k`0ssI2h6QId00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX1O^E%0SXe0-2ea`zez+vRCwC8
zoJ+4I*>cx^5wTW2_CBxb>b~85ecLvY1vVfV2}?-KJz&81LgF(p;4?5rMhp-VQ%~>&
zi+gR{?(TY=bM_;1trfu_GtZ+Q_fn1Ps8n_8RPDVpV@3QU;vfG=i3tARzXBYVSIF|K
zBFj&y(L}Q2bMZd+4K>_of>Sb+GVxdc>A(Ns7r!dEWuLAH0YgANR6-(zh>$?SG{ANJ
zEOjnB250o|Pv3w2ul|T|Mi0}|9BLMd34wzP5kx{11jCiKUAaO6{e(MC{ERPo^84eL
zmNE}ruBBOsp$38yjRv7KaQc*!W-<9)pW)B$BbZ;mExEM4AKQt5(nz@bm=a0^0RfHH
z+#@_$x4jRD0_gkK{5cFH@0dxqn~|{_LHm>ms4y?bm6r?0q0;A3Lp>A`LLm?VA|ezQ
z0#{Vxx!Vfe)paLR>Dpxk4k;s8g9?TS7>Fjxp}xFK9<Eba?I)jXqx3VavwrWf9u3FC
zp|>u@c3g`~7cg*WaD)Syu1>YhEp?j>wiu5HBqAbcv3f-iN`Oas_2$Ub27C-A7@%#}
zvlygNPv>+sP>Xbm$chExtl#R-h?bw}K>@yA*J2^v?=ESy*C(AO8TS-81zE@&Y#pKS
z;^KwMn51#8gdmOx@#se%i8amp%YExw7p)5p&>%qpz!nFY>-m^=gGh%5>LAGSj{b18
z@`+~p85rcTo!R0(!UofY-~82YZvW4ZSGM<Ku^Qbl_&z%_YG>7Yx^`cNXi~A%KlPx%
zk?p`^GrKsk-H%HYpUZqc*7ld*Pt0e^G@a`C*bgSAWX?YSlgob@^GRM_5MT}h;Y5Jb
z6tPdVQTlZ2xC7{eb(AfLg1+X_hcEkUx;Erw``v9jH)W7sBnBC{yrKzBIG!F;;r8Al
zEO;9cOFG*E4dx;)UFt1$QRuDj(pYof<$d3o6KAH|5+swUThjuHRb;_H4+zvgYly|O
zP}4OtG-yzu(Y17?7yEq8;lSCcr5|#U&>}wh<mcYJooh5tx!bJcPXf!|O<}TqaPCv&
zloj>TCJ#Zh2WzCJ;ib9SdAW?VAU6V%#Ol)vcd*YKVoYT+%Z4Sf)pwR8^%EDepTpbh
zqtTOuQoEE?k&vWnqJ&!45xON{M`XbtKmtJ!k@cs71RjXe8Uk}eTs28}v=F2mCrM&M
z-t8}UFTdi~6Z=eS;YYdbxapDPerkz;^yxUAJ`tcbKwOfVVmNW&_20bO$uQ`SH)oEm
zXD~6sXbl%}QP5C<M?hJCMjo+K14l!Ua8O-gRS7|TP14Klg_?Vax?tgHyd)~c>+9qB
z)tf2GS?Wp4Y~_nzef7<s{1H2{<b<5+*^=nz2I+8yG>9k_0=X-<fAgy8a5}%uMf;|i
z4wP8JPYAVmVw$Z!c(2ry#YXxhIf5ff$oi5e|6c-IOy+H|aMJ$5`oVmsUUR&e?ykCP
z5;TM)#!g20+#Up|D+(1(U@&Vs`p~DttNSjEIqe7oAsjO_6NPvH7k$q({&2%vt*g(G
z$hTVbo$`9Cwjw|g5CO4p5b<`^U+?;BDzFukGm%1i`J`I$6AiT0^HdfO;!HkE7nlsA
z43G(-77$XRPn^nw6&`#i-nq!lzvP_`LmpD6%2R{JLxt^Nh!a7LChiecqDVXYbah?i
zn{G8`0dy@M<+FmcZ1<a&Pqho_yCTx<kq(Tg5i|+YwO@RU3Ou$ZB19e>=iM|Z@8?Zl
z8iy6gmf}X9{1;8An5wB}k<s9MR}Uq>f&qXIY%3}GtR6Juce6&v3=`b@-g@YnH<$=<
z6&IS+T$`w`)$CgJIpDI!h$4?RTK&k^67fj|?9bwA`Pt@ZDY0~C9?@!Z8WF-cjE6VJ
z@voy=JJn-LvAeps{NtD8&upN#zj<}{cdz@B@*G3yhUl0eEAtskWUc12#VoZdNF7WB
zmq0@$&=3hEbSX6D(I~7&S&H5z5MqriU04k9D!9}oNFBCLg5+YDdNS0|5U3%?YJKa+
z<c+)OJQ<hsOU8HG;Ag)-I}QR;Jo&pkAm2M?d1z!B*IfIXH(k>my_~_pGkuP}u+MVc
z=^$cL*LCxBSH0M-pU*Xi<r0^+Z-?pa-@dx)uVjBo4T{qmF-OEw{g4w)aHly-)2}8f
zCUHAYmtS6%?1y%g!S2iXT#vh}ao-JxzrVe<%k%9#=q`y-BBru)OLv9S>2inWTrzae
z>)mJH_|snM!BoH7gF>F0ywXp(cNI-Igi;H&9NMg^HQLp;H{-73f}LL?kf4G<g@XOS
zcqr<rzP&S7S*Qx@Bq^$BFqbuREj)=RDhTv>zgPM0y1SuEFW7UVTMRV#?prGT-_ri>
z&GAs`VZPd3sw*gUVyY4~+@2ND@x+OEH>*DQRr)|_ARlNfme-j;guB<k#4*FeqqNe_
zem3XL+xx5WhJIsV*u2+aUP+?4X_8z$0!xxa5|OAxMBqU&m6dK2VfjRf)A_CKvkfq8
zte|dhzGMu6k-OtmXO&QFASKkOMxC1&wO@G!`7KP2ZkN2)tLeA&T>e<MY{ptR30f>E
z))b9ut!m3dl3hCAPU{T_IL(`7Yk~RNtl{-6Ri#QN>KY_S653qd-J@AjUyw;aqJ_7p
zbJU5FlMLNv7oknHhIf4@=dJ!2h{WaoqPMZUK4b^6<!Ypbmqda7J#Om*CR?yi1JXMU
z=)yesBLS@oNclq=@#Yb+64C`!I?^uRPIuyQ^7A9PnK2B(25{)05(hu)v6X2|<I;X5
zN9hc)=n<>#p|vetym%w3dQm@?Q%77aF`K}!eX<7(FQ8zY^$x=QJhfw2b*DQ-F;Pi0
znBanVR;(kU@c|BGIU`NKg_U1vn$2D-!Rjs|YKDY+m1H({db1x+EiTeNU95cT0Pa|X
zSc#U@q%|><%h-RtyRfnMPG;rkKDo~)s;Vc^5Y<2&50yx&9Yf!D$=e(;1nP)VovbK<
z*H*I#0c8A8^6^{_G4qS-m)xIeOVQAoVzHs&hr%V^=h<U{xcDFg&l9_ZKL4?Zs1o9H
z6tl?t9baAC++5J}!oOnJJjg)2QC;io4QWHZ;H7;zd`aGMhCAogy}UlvI(vk=iktO&
zcXf%d=!VX&M{Y6~eA&IA6mE1a_H<#UqUt$|Q5)I0tiSxnFKWS0zUwde{w=Q$ek#gn
zW|lhShIj-ne-D54Y3&+M>!4UM^)c6N_@hq^7z@j8n0iE^hDaWbYuGK$uPCL?xwAG;
zk;F|Ks3z-jfS5MH3<ju5CvJ|_lqF?Flb05O6Jn~n%uVL&HKy>qpxe33J>5dFsPqko
zW(vKfUwxA>s?wk~4ySUQIv1qNDl2=xm72=)VB4~``1446kL%Y5yR_B>F~n=d9f$tH
z#Kff$-H_iN-g411ZiT#ok^2r2>$_zA+|1YuyK@^0`Srcnez*231L5iRaBiU~=V;~b
z)sMKVrkwM+%x~`BVw*oU=r|pZE}n<3tst5k{mdx&3h&7mkk?+MLDM&fslU7qwK|vM
z+q<n9aG%@aN_DOtAIfO*kxF_q>e>gGs-fU1j1mhziHj4iP8O14u_j#wrGYNJ1WIT&
zJ<nLCR*Hhixsn}II8o~8+#HX$X3^Prc`=5o#B$8;vW4nG4<;hv8Vj=~NNF^XhB&D`
zvX3bs!Tv=*&hzOkjnpaiv>HxSWxY@hyj1PdZ)r6g-W`c-$w5Q}2Unq6`}hVf5#e~U
zl={R{OKsL!lAvx({_Pw7;=kVY<G$3`jaDmC$w4m2-RW0X<JZFrCwr-&)GDGD1fhX1
zOuoqDL^LlpQ;!fh-0}MDLiJ+4Q2T_Cg1g@^9{HNDQyjC+;pOi2+b?cm52mXl1bLY|
zekj&H;6d@kk4lMfNxJ>RQpL<r(59gtBC49YOxjoqeYDP26Y$^u%k&@r!++jg+%&Ws
zuGI2$nmXhrNjKg7n}7Xh-~6+&OBXgz)Iy2H5atW@;fN!)_<Vp`W@9xYIK1WG|GU44
z`fX}zvG!{&HAmT%^Pm3SH~;p}{!ynpY!tsUPv|;aSf@tI%+4w9x!0#X*H#>PS`kU!
zMW0SL>S|$~AO2xNLQT}8hF~dSy41}L_b0QU<y^kF?xlSr{*p-EE>hZu9}qtr?(c8U
z=V^4uXL=Vpqt8nqF9y-oMyr7wR2A@w0nX``!|i3OH)#n>A;g=O6w|9Whwm=51*MWj
z=(;a%F4=G6#)n!)LGbF*sXnFgw&_#)V2+pAaM9ra^ESOb!YMS=R0WF=ht)vxUY{GQ
zjk12BaTBi5uDoTW4?H9{4r;W92FV)j2#tl0c+9~5fSM0eTz5JH;d~<6zSS4%NN7`<
zR;L7~7dKrVZd|DjK2r~BXa4#Xy8&y(TXfRBxaJy^VNB24ss(FT4~h?n1;A&tF}<yC
zzJJy3r%}6v={@^$C84C=+T_h6Z5Z*yI!|kY^MPU5t99ar<Wdo}5WBmbdiPK~=zFlr
z{f|_~zQT2zaK!S*cHtf&h%8|T)CrYArAIg1mK>%*3+5^<gxuqPNBI$X^W*>ezU0eU
z(?pTpUjFi{FY+(BfC~Ac1#=!j$rBq@7f+i~&<skSQflHShei<hj#PEWWX)v{bwwbe
zkDTdNf8HI?Gz6)I5O_tEa4s)i<XpQ<X^cQlh+}~))BV;K>C5Vy4I;b-33)v22$J<4
zD?*E4ifEr`t=t2V5SR{4y$)Z#i2K{|`r9*dU+yQX+0xoJ>hrqiiMyn=YFNkrYeow}
zmJl29yK_HVS7pRv66%3YneLjFbDR6!ZoLOb^%;txc<}NY-rk+R`MsC(9dlu~=XBuu
zlJX|qzB-*x0QV<`AoVZEY5HO6Z}#M95w`E>m&+><Nwq|cNL>d(n`tfX4pVKIvVb9u
zIo7P6<}Y8om@0>gwc%#?C6kZ7<947-VmiDSj>p4g|A<8Kz*R22gE&}vPG~&jAbr3Q
zb-JcqQ;kF`>zKt*K}2e;_3n_yO9n)isg18p1w=wKP0r`}SUredJo&`ibNOm--9>*n
zvftqavE)-|o2~CLtrDfW7H686C8QK@x$Cp!m2?y&ad9P@isB;bK~%!AI*Gr2xgR>C
zHd>IaBP%|0oEcO0$TGVVCYuI~Sl~F`Eto%@w6}yP-ViZY4ND|^i?YB(9~D+Y>goEo
z)kQ<h#xZ}9_N5(e?_b@e>8JDkAJh{mP?|_Yt!6#6Xl{<W(Gp}ysnY^#ER72hR3Ibi
zb+T7U1|#D_oicOhC+6EI*U2wZB6|=sJ`t4&5izqCHRsHOz5l`VL3to5wKbZW?o!V%
zuC(5hDE4p>36;P9$!q*(p5L@8S$00Xxz0oB4i<+#P1)bn(@lyAE2xNSxYH`)o#xIu
zbi|<v(k;EXDNP9BRQ*`)rul!XilqyQUR@3EwTwE);rmoyj`?Dr@jA8nY!YO}T})Kf
z-N(NFhc-|sYPjPfl2af>xeq#_HsZ`^Tn!{}aSKF#{}1)g|NKv`E^e4DW@*QEVLj)o
z>zsAE|Ksnjzu4jDCSF0pT}+535vH1oa_0=nZYfrSQOKxJz*F1b@a?ap(=u3*5`OTQ
z%HVA$^_y?M{O+q^moX{slT%ELE-||#Gc$MZ`+gB6{gy$Q#3Blir(J>?Dh?AAe)=E3
z?(eOymZRs?u!I=aQ1{d#MRcupaq!b@b^Ky~^W87F$V9k_E6urk%gr9G#ED=3PxOS&
z?7$CP4`iVoZY>I0eVTN*Af&Zgn5EOS&vwzrKuKOY-~av#dKyGxhT_a82GB;i<M1Q%
zYiwc+4zJ3KecGqm&UaBxLo!sDBc?1v*LLM6UjO1>{61f2_p=UZ!612$KK$em3kM6q
zFx8+<)A@LsVk)_|+;l%erhy2hS!V<<FOdbLI=XVGhg0uqmv<tCQ-ph)&t{4ZsvG4L
zB&<y_&F6Z1@?O0scDi4vj|fR(pvt(z8dfRBT$zvfsWy+_dy!K#FDGfm)UZrMZA~LY
zL{+^yIe$df_Wv_kH4Q-!S|DoD?~IPrx>k~3^_OeEqcDdEN!AL2TNoL+L+j0O;fJ^8
z(uxz3Ry}Y=oaT5{RIN)9rB#|&$SKWd=L8)lLg0cdje9I@Cl?Absn#BDzyD#^S>IV_
zN+@ovdB9p~imdhC@6;mvZo!MHyVqKYASF~nBqC^y(kQM?EUewN!F%S!8>rx{9D;8x
z%Ls3IaWPz|AAkDZ>Vy|l5jD*{l9^dY`>KfIK}gm-=6*+a_rvW~cd@on0tfW$sci&9
zgMyvsG~W+CUuOMcH;k6F1r?e^RiaC_v+<(M^XYWzx^7{It?%RG1L>cka`g};Hj*S9
z)SQd)ikxYQGu&-+n5W%Gfm6XH=RS`x`Kn-j!gj6-*~fSWR2)<P>hcTg_N#6JaBO+`
z(kE6pkW1~|vqP&A@u+n~7vf4{5rKS0@q#~>-Y%)lK+kulIGyDF7(YZyRBKh5ud*je
zA;~orx7p*|v}(#DVXKl*6rl+ki0HFHj4TsoPKRUv_mSt3ofW22%vD^prBVk?$@@5K
zxv$nFhtOgjmM*hdln_~nABoRuAP^TEA!1RJES;Bksjt%7-0D=SG*=H<NF6085Df_v
zv?EJWFi7iY5JEge9k*wrZnmzPoRZJw_^QO)C>j+n;Y5)-&8S6hkvi{FsGyGn2k}+S
z^}sHCZUL3VrYI0!ZL|>J!`MZo)fP3Pp{}Z8>PU0KT_Y5;Wu~mkd0s?zA-L3#tu^)M
zw2Sz1YyE!2TlLmTn5csj;rU{B9nEP*Q_&<I(HyUm{E3)oX}0xwP=6K!#S_Y35pSq2
zPBfK>2wx~;l`6|_fGxuVmxZT}P+10FB*X(;d|6|0aSaWTjj4+eUp~&ot%|!x6LBn5
z7QTZdM`XS8bxlR2EF!mOx-{pBUhT7nShxtWsiRjJN~kTF(=se9h|?AhB8#XkjqE~6
zEGq{z7eZ=CxYiJd@DRLz7{B;xpa7Z|!Lnu4Xn7e2qSV)ahhf$u4Gm1hR8o$1lE)RF
zia=CE`Me^|c%XisOGm`3OIim_%Y`|$;(-L3u#B<pPe{0Xn1^_*LF5vFEb_;Aa`KN~
z$K$cLF`J4A&56JorfJxdgp?s@0Sy&YS?4+rvO7mAu?{KZfi-<jL$BnRKW5SNJGaB!
zJ*%Z;pp>#?90E~SwBd*cDn_MQxHv>0kc6;R{4aH}Xo$NIX_3^e)-hk5UqXbs&Bgtx
zJoa+9A~rpTRe)#|Csib9Gs2<`#ytwM4Qw>F%&q~IP)n)SQ<O?x#yY-uzX<a(WQtGG
z2ff#8JfA!gA+m^$Byb6n=Unm=Qklg%vUP`B3YSo2WlJ8lOwaan^tm?p;pH1W`oQuE
z#3Jiks`Gdv_jF>doh?3`?$^(cCknGq#vol6p5h(l@`fBCA&bl*-jSm|(No0Z&|e;9
z=I^KBZSean@$=p+PdDOMEZ&!Y#iPJLKDUTdKqMrdn&zFOaAdt*5qa;Pm8FGXJ7m@Z
zcRAbm&~94%cJ<qeG4io8XW=#%$a$<wK3f)Rf~%|&rv-waT-GvjZfj)eiX+e52MzUY
zTj<eo;&*J$d_Z9-55gr`ON|e{&niWBM-l8Z*Fl6Rv1T)k?G7JW{na`I>Vl&7xc~J;
zQU5T@iRY2H%AoySC;G@_*q7^Bc6j0=mW^fTxGaKv_EiLxN8mt~sZTt)pHNfUBE;R!
zS>6-5JubF{KC{jPpvXIr{9&aENNlRYCrVX+7sW!K%pLU!J^UH!Aag=g7Nhusbz&Qy
zJE6Mjjr7AO|FNU~kdX8v8`dAuq&(Izv93Fae<T%tLQeYako+v6(;OG6&RjVc=0a<@
zBf&fq>vE1DNzFo{1fe1FJd18?LlW$UG99PWJ$=FpQBlW&BxEHCrV!D}`(~054VBP{
zD5W?-c%3I&Aqq*r@diOM%Q>YaVwkmBRW+rw@K)=P<R7fnXt9bFm!b1AmK0~%qFM5r
zFBQkf+MY#$WT=uP_o=l;f+3;$$k(jPm`gU)=UVS4?^T<anwe$=Qa7%_Kb=t}R4ky0
z6Co19=gwl_NJ15DC`cuiQwrMT4x|=@n}~_&bCKgiAjEXMw=Shbp%kC;*;}~fB#ska
zTSUaN(;*@vo#n@p;$b^TFcFhgGTvIVUTc{InJB87Gz%utB9=@S#OH2Smz_NW6{Hcx
zX*FthvG*Bok<>IY4K&epaXP(w@)AHElXe}wWa}v2Xd!rZLfqXo6eJ|sA~x4HRgL$;
zEYwUfRU)F^PlwBK_jW#tkvdaZe6L9{Z8bs#!#=kMB?FKOwNi`JB6E`{GM(crVLMZE
ztEE`;ZXHv+ht}fFD-l`>$r^E<Pl!Z|htao%nWnaEYhWS1O#kIE>unj(1P!OnQS^GB
z<dphOMWT6~k+~*BMZ^~m`n(2mbje(;P>MzCRQkaZntI8RB6q`u7Avo7nM!KuvEEsg
zT1&I;=kqbDRB8L`3+=?iF|A&gnT(04NVu2M<~q}2Ov4sj&mq556ry3So$~E)ef<qL
ziQ881569QXh^isV((X5sf96&r9BPSDti_P?Ro7qjGIqSM@v!a#aL+EK`sS!M#Nj0G
zR60Tk<HgR^3v>UA8*cVrl!=^}XUtGt74B2zaBjC#ITx?*6v4VWrU%jR+9<^<S1=}a
zFj~^Fy}hq(?m{0QA;M<|>FQpq)@H~c`Kp(%MlPQ$xF<L<)x+)aZ7+wN?rn{WmAzgB
zdX|!FZ3tH*UjaP{+DLlRd>j+>cATq+`P!pDu4jgW(>aOa^C8an?GA&s31i1ptxl9q
z(<&jW1v29Pq>UvM*+kdNeaK@he&Sp#o7W>&v?uN4Q0|U?;0h`v7-0_y21=S@SM5^u
zB6-ruYpn|<-{U!ox@WBW@o>+m7>sZM*RbsKjF4alV?G=X%r!O4O_rJ8B2yJeygC2K
z3por^yF{;)1Xrs-^EAJ`t#^8vPI~_S_(P11iw=rJEgFlUYsE$pq(RM#x=q)aqWp{y
z^G>2;ifL+b;6%-rjY+27dT*|-7)<pp4ihI0>vUWn;If?T#(`PR+UIUJGC~iTSy4Q#
zEA?q@I8um+0>z<LlO`yVS7~WETe*+>Q!ez_*sm@eAPhI-*MIQsMc#AtxSNH({&1Tt
z<1A}3>jNV))l150>m!#H_4Q3Y)j*zJUa?QvO3RVuoUeLDv}Kef<A}m#dhyGz{AJta
ztNQC(RWM(5LrcXLoDX*)&$i@^549H}n2JGXkWEDtMOJ}Ol5hU`Kjlg<G>}3kjF0`6
z-1Haw9$-f9M-I$Cy-DjhQZ*|b^q?fmA7fQM%|I^b^~l#oH`vIHUM;Hv3#Db9uB6N*
z!*BsmD8FtAcd3C`#G+7isYpZU`}_zxt)UH(t&LjMgJOtjREJVR9g!e~7&t}0Q8Hv9
zI);@ctt~{crO;m>X%EV5-j!0l%<glo6e!T)t*O1o=l=|KhpVeKc1DK$xb|1tENMWP
zBa(^;zCIZN+gWlE4Q+uaW;9W}Pd$Us$vUJ4Z^g`(-eL(vO^^svl0*wamsxCVq9;$H
z0mT^<4@{1AvPe~2JbLTwLDid}XUg@)_GaR_)eiE5-|ENM#!vPjA4T`8JmDeQ`#uL=
zytWoiQ!<l|1~zk7?{is}N1~IQLTFy2mf9Q%V_crplAn<r{?IBLk%*-AG(*g;4Me1c
z4<QpJ?V#6X{vL`A2@w^YeM)pFmLK1=<~ZEm$J}O(N-V=&K+T>H(;sQxPkcO%xF>mh
z2G92NASJ3-K~yo5hvZ<1l03TRQSd-<H8*cjZAdLu9XbSjM$BoB2_Zz_A!=)sNhGSc
z6Gg*y;Va!#ik3Cw2rU{|jVfYOOgULBA1T{LilL*P-p+U{&F6=wtR>uCm8VMA2fzA6
z4}!z#?gcL**0o!NaCcf#lXb-Fx=vU)-%a2A>37S+xmMB8!}Hb_S)(;ZunzT7O76N4
zm*w$V+eS@@AhQ3%?=}VZb`O;?ubNtfQmd#Z&4KsQFK|*?G0WmB5_Lm<`KRA;4_;?E
na<S?9-Br`G=UxcQZo~ftJMVDiO$HaZ00000NkvXXu0mjfR5l0D

diff --git a/addons/mail/static/src/img/feeds-hover.png b/addons/mail/static/src/img/feeds-hover.png
deleted file mode 100644
index 67070d3e7dfb003cca7ef8896ed04f810eb05ea6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15696
zcmajG1CTE<*FHG5J$G!|wr$(CZQJ~famTjpJGSSJZO`8KU$tA`yI<9Ab)}O&IXRt9
zDt(?LPofm%CE#Ix!2kgP!AnVsD*ube{}Z4f{@rUdYxDm_z%I%X!a%jNxM%+!AdF=s
zM1g+(a~1TIr~H#ZJ4$M~00F_G{wDwfW#?l36GFO5$%#R3fg!_ia}BYxSp5@WyNYSL
zia6NWnc2Gni8z}Xxtf_0dRVzy5=uzPDQW~EU;+UV0!fJqsd{c)_Gnext-IyF#BrTy
z+uZndZthy!qsOR?81JeOQz<jkjV0R-IO1+5gW>?=4ncn=^Mc>X=q~~R-y41mV4#pT
zn5>1Hf~E^ArBgB$QA!&#xR0D``7PIM=9+WZ)NqZB59xOCSO8?084GkGY=ElHcbew(
zJvbf!F04PV5t&)@Iu1Q{tg8WFJx?p3C2c$2fsZRXh>1Ji7r+ZT4t#>%7d4QQ4n0pm
zXEkm3g#WkF|7Yg^w(vhn{_o8HHvj+s?*Fpz|E}17W&U^V|IepwA~rgv?@Uj_0rN&1
zO6rhs7!dY+@_ojQ6=n%83dTmdWMW4KQW?A7hZDbfu=7C(g2?ojje$!c937dwr9&sp
zc(B=Zo#6d|i^wLv&7IWMbR}gOQ|QMK8fTI-Ug=j=Z_Oj&BD8r<Ph;Fnoa$eEDj|!K
z{^ZQE?DWR+zWPI~?u2c21f!i)d?ij!WNE4xyPvoHlr@dU7U7ZL&hL2VZ7K)|Jq)Vo
zI<vrJ0e5Qts)Ci8mIog9h0jMoYVh2Uh&iPK($sRrA!u=Z&tcUH*g0r{mfiq5wztY5
z#sOmf=~{!aT)8&NJoD`nRO69_ffBvp`U5QI6<=fHU~;leFaij`iq69)^vDro6aIj>
z3#(&(+tF}rVj_XdFyF%^ceYicYrUKS0$zG-1_hCI`dyw+Xl@HOfJ<0DAmI-cNSppP
zd6Ca>w5Y(N<5lB)xoi5x-|Aaa@0;)&W}AwbQaD6PXqd%jz`!r{pFZ+W|CkTvMXg8|
z^;ONPCE%62cmfBk6Z{a^Wt+JE4Mr~vc%{RlYRb4F)^sSor+sW;WPfdzX3OYCOJ~|0
zMF=N=Fy>_96HQfT`+6nc_JYT#4SIYufV4|H*OOo&kMdzGxBcyHts@Cqh>A|hd+fEP
zeC_A`q~j0h5&bkLYs96%7w6Cfkr2r-?j93c=pp^gMtVnY=8Sr7!l6WTZI>Z&j$Wyl
zZ~bu<9mclyr_tcM6Uo?h(|dLT0HyO7(cYUNHxOh@emad)hSPl^uo}prcOvtzKu#5R
z1`Sbz5n61q2H+~>v1`GeKdR@RkGe((JOu<@kXT=%_Ys}~3g`1(#UwOMpmt=B0^`Wn
zX;Zw-zSm*OS7_ECzoQhV<yRyFMy(OE0Hf`))6g)+oL;W-LQuVrgfs6fqe$l*A%ic^
zS2NG^y6HHE;P^xm=U-v3CD5bVY2%)Ixo2Afi>HlXXHl@Wtr9yk3Oy~|3;S5wfY#1m
zvKrqzblf^zWSr35DLm|&8H`Amq9}su7=`Q6GL#Rf#$@J+Ca_-n;&{7AM`*cqAu8#o
z+{c{_$@|)6;EF@Kf_IUgxwBA<7kq-(;#KzDlGf&mp<>AkCKcf3o)A>VmE`ce!a)wd
z5}_4?y)ev(9;*0NchW|j3#wr3dn<S?rQ|ivCPC!9;<y1{9!VxPwK0$wXIeTRd=lCq
zGC&lt0dp(C&Qn;aVmr2E;IwZolirt&V3$m7GOlmBT&*+})t}Qf-4F={>v?Hwr3Esw
z)sW-cStm74vu^thbWKdeV1RyN%VAxq99~fAScs?a!tL7HsVB=|8HD-E=S<I{DSMq-
ze9D2+5o3-d`XzK-NDwWp>8gS2-xs7~2%z(a_OdVCX`R#OehFTF7XjCSE#saOcf%p|
zkGHla;hOAVri}-NQjqi)x&l1Qd{@Bt7S`$tNEVtJIrV9Vo23}4Oa_eUL=79o$ddLs
zg=E2Ij*(=fEu4$Go=xNcC@AB6!(eGaWM1e(VBnGBbUbeK2$oV^ut)4h9F7$=fIo8i
z#Rdeu&44d|je1d%nuX(?!`fZ!rnYP|k>hSEajO^mru?v)JFQCFbntd%{RZgK+{y;T
zNs~^B9=Z-~wWVSxFg3~Z&c|Z&Uo~C0in=6o7`K>KmFg^_88o}{VefE-4^KQ2JNSly
z5e&?7&X`E716_V5RwHu4UfAx3S?lt@_Gu<r%v{^x+NPPdGiutPX{HJa@qF&YJ}q}4
zi#)6P@qICeOzQ`sJSuCPK0tTGn%R(jRa&aWPQbgIqeFPD?zPB}tBI=f@8PPRqNEl^
z(?~W>q%bli-r_8LqN5*-9btg2L4_Bo!_9W@*k%>h)>ka(BTX?`AvBjNDkCoaY@TOs
z4VsT~G=eMBQMsecsitTUEd>RK-&3wf$vh?|bc`7$1v+jov+*`=><UPWD%L1Sv>?LF
zB>S1tVUkj41C?VrNGEP!G+l7Y#u)U;&%A%VN=wKr<+AY-%OXyX$ggj?&rSo~8xyV!
z#^w;9Runl$l<M+8*bNLvD_K*y=tARSv@o=)XB1lCfnO(+T8zLMj8m2`x1a-azcVZB
zIYE5_w@O>RmZ8NZQ6-a<J)AZaHB<CZRu86~zkg2=XJL~EXETu!k(XGKhLE^udf|s-
zCdwf0H<PiNOs>;i?x~snsBK&@EL`@9v*n=V?ulXqJ$1_`v6!_^tJcsl@pWuXccNXI
z6YP>gzLe81n6#wJF^!*1P=xUCt&E5|Lnt}720!v}_7{;w4zUcGCiW?6fO477t3980
zul%8tWSX)?=f<cy>R*<XL_=~n@`<T;L#OWpec3~+dZ}~}7#f&jIM5FWyYdvZLLDYY
z!j+QV+Im^VWg-&eCsXb66jA@A)Y7V;&?w9_Ounv9{Oc;Om66hQ80G%!solp8_IwKB
zruN^M14-n0pYQ!(P7^)t6(U;|j4uta<wKC8i5YTBs=%wFBXyxf4}}?|_xDV4et{{r
zQQ4Zuna=mg&0*k`V(Xbv#OdA|rcL}rN&`_Ev5C>_0vkPWn+S*UI?S17i-fmVg?KzB
z6q;7ICKs5TXksFYNILrmIIfvddxoHm)43{JskXW6%%?i%1}8usb8jgq#{C<&Zh?zM
zpFkvPh30M)ul4?Z`UFJ3pOt$aRywe7zhj6cZp9QLTU5$W)CCs#6t0Y@KZEWZ2G8~d
zeNb9+>J*dK<|2(ApNqXbJcbnCc+s*jcs|pw=vkc&J2l?k#fgpd`}e!Izk^SSXB5TQ
zUYhz5M&JZTD`Ju*1-?fgNi50D?9Bs?21y9aKL^{e1zym_IRJ({+oG~e*z=uqqUCxG
z{`vx13$mB5IXYf?trbTA+Shfb?{#W5GyKTSbHo*s_LlBPyrBD`Ja#_8Z(8}p!`*l4
zFg|P)UMljz08vD*xE#`{VLMT)?O5i4dI*d76+})bBs|-mr}B2k-Qw{WgHr!znb(lj
zdiUt^tLQjGsslaq#f|PA!gy5MT`#0L>5}e^)0T=fC>)Q(L!F=+fOJ;)VDg!dw9C2_
ziX~!V7c*3YSJ<lj`>*@rQ3hHYxbnY|qUq&Pbkv98ZK8}&$BqzEE(+0Dn$}rpm`(|w
zVv`^Il3!b^e=>T5`kp}eXDEXu@(AVY(O8%q7Y|tYS|v5+uylr!s)GmE=a231Ty1a?
z=&at#{R1tkr9Gd4lGWLpOs+#a;G=N0PN?(#HLW!K0cS<Y=K880y@O&l33n!1mei#q
zT#@Oo7)rW)aoFf{e)k<O;Eor&X?^e9gZ15VuJ#}n5jJ!2KsWpNnZ<dUrT8@br^R1@
zmEHS043lk1D*@yfTTfd$XC@vOEG`qPof!lT{RV{UGB+JCCRH$(Xz3Eg+iVxrF?*pw
z#R)Y_j+?7%Q6e;j<ob$ez?SO6m+G-wv==Ahgcq)25^Sal?D%X5+D&)3u0N2^TUTt~
zPkAaN1JikSkL)DEbVq>61X~KdQjYp~B9{+sqcR=lW_M7vyO?uuVdJG}>Qjhu8Z;w?
zM?PC<ZUd_6HirRX3;0I*9xstFwjRG)E>hln=U<Mxyuk=pSC47BK2M66lp(Eaf;px^
zZ%4r5&>P2Bx5EUQo7aB!Oq0BexAC#t^08%Ycg#S?$9nHOR0_p+X0Zmo1rI)<6AVAC
zhu?&&hl?<Z(Blz^-bFe0a(OBbuQ`Pcq4PA0jtP{^zaD3oG&n2Jd9-2ZWoSE{!pK={
z;xh*?f|i(M1Iqyr<3T4yk|f<`jnL#v_KQNTC|jMcB-*<6$v^7RGPgIbi0~s4fE7Ou
zR&zpX@b??u5M8bd7~SXn^i$&P+wO#xb`)3!YX(VjW(~X(b&?0%D%p-ThPW^EaQhUF
zVe<(cm86i6SM)c7oy0oLBSmMEFHwqL;SQ}(y6yZv>hxp<;0vMTrzcCES6p=*?_-?l
zb}Y&yJppQed>>}FViPQ5@U+{+aO2nfFH>Tl-ML;zPb%#B<g8e_S7Kt5FWxl`!xGz1
zg?X>QxYF-*-1=lSP9IiE3(T}GIIj+`ft@pQMonxCsVx7r(rpe@xQb&LP@strGT(y|
z=R=W_Y7FZEVfK5ef)2p^2`x*f=2T`Wb_6Lb83oX9)hEN~yYx-V7mgf_XrqxC(+N>f
z4#pziokw7QeSTQ=KGwB=U#_k{sQmT}En!!=c9VCOrFpFfHxZk5qpzqbDbX-c&|cCy
z0_*R}ghXoll^R0Evna@A0;Huul9a|C?Sf+HJIuvp_?*U&IO(8h8P^H2y&?V^dD$?M
z22z#hgvr3Lwt$X7@xu;DLJeLLrjjypY@yh^(KZBA$E8k`{b5+X)9lSliZ5RD4;6X*
zs0QvhR}t6s$Em^Ctij=^NALLTE15X1lBk%;Ao%8=r?%`JKDmw&`DO5&Cb%Os59v#|
z4~<-*PM)#F_=hhBGT-bV2dB1ta9lI)!C{LQLBfMbFl%1_`Y`y`#4EkYo)|PAjrw^q
zW4EAsw<Jwl4`rlALQZXphYneSIv63`sy&ASlj%)$HC=f$$<<_<(f)fYXOcXN8#{p+
zKA(*CufGZ^yPgmXY_lPM>}6N!4We@iQ)#)eq{{nE$XYiOcldg^|6yBtL}7IpT!?vW
z{?xtHez@hx*Ul88aoB=W*Jf3rO;Ag`ty(DtN;#~BP`#~=kEFaRI0jv!>n(*YKL&pv
z*r)i44&&<?li$t!Mh8N?)Oa+W^e-gN))5BrPR_>IL4w484p^C~TCr><R+igbt`E_l
z+WY}`FMXrwJCoO`n784U!Iqh5%|wJ)VdpSOqATaZ<#}L()|kcBBg$iDr`NhN=fKXG
zxrAf=#8b3p$U5~fN<+n*$jNZd7?!mQjCH}VuO0nCP{1LqCYjccEgX?`(31V|^oJh!
z!v?*O0dqP~CpRJUWagCx1BE-NK;?8hXc2Q17<s0%5Rs-Eo$fG1dZW^zl;EBUN%o85
zfjNy+d!Ih*?|WRzY{vJ)m{{@-`@u=w2gz>Jhq(~5&F{_kN*!q?f&u-V{N$c?G<3=~
zE$H%;WKTdHIkyd!a&;fax$Jo?dj&2=${KozmDk>l30wr^dIdDFdy!P7h#iA|ue2ir
zsHYb`OLN;2F5g7iunuOPS68vKyHm9A&LV0VM#{*^o~pP)ZZ0t+MP+}M)mJ2wglRTO
zsTg5?p)B8`6u*4aE?&jp`X8=hue4Ea1hWS-fLXw+@myH4KfKRQf&eVSQ+WQew8+Ct
zVbJwW8GdJ)R?%tA|8w+{NJsMagP$?7l+Y4o0VWM8dqGc5R8`(xjj`Cdpvbu)nx4}_
zNx#B50OcD2pnm%b^Av4KF)z%%mllarh%C=1oX#Y%q7#|Q<rS%V3KQhs?YY0UaKLB5
z6hbl=LP20(iW2gQDT&*9Kegx;5-3Z`+*Fo`&1f>gmpZQPrm=xrs{^O3$|DnR^K^d`
zWpjZ|WiK-Qiq6~7S^fvPxj~rt*qE8_GF?bP83JdK@`Bk#0}!4>a*sxSH|Uw#I^X8h
zr!uN_za$!$XEXO3LsRWrIyn(kkCr7p|E0+6eI)hX^{L!>qjJCTigf}xHBXtgq9Cp~
z$Md1YAVe-a1tZHPLn5g(Ie;<lm|8Ib7_W-U_P*Y%OLHWx+kHCXGyzkCpN}s{q~8*^
zcVJRys~p+0y<bOXL+z-uBg}NuUGdvsvNOf}2dEOgQ!TI&i^@@oSo6{WLzD0(5h9oG
zv7&;Ox<rZQ=zch&D}fa4`S!EIjzk>^@o7$D(>ma}l@2x!SDBbfu+IH39cJ_idEM}|
z-|qm#8TbbMs}-4aB^-5C40IU;s)2O5`8B7dz_VVOaAr~DaX*}cs%~CM(`>MR=IfZH
zp>5)hK+B>_GPgxnomyFqnamYsxRZj@_nN5vjisL5^eoC;e^%YGPxF}Ms#$a(*U?NN
z?B<R8`AO*gjx3~#r<!Y!O+Xj@7F-G9?M?p0N9?651$6W)o^g1E(n?LZ{d3@3!-^-0
zCyeO9-lWn9<9?=p@R?PMzrJmB1I{*Wd#+4!eJ&|Dw|so$QF+?ne9id0s2g8ZW)*=a
zr0fR=8Mr6%#3of$#@Qp_*1S$App3ikBKjuY-q~Qdz<x#2u~#*?OY?AvDi5>LFKkr>
zg`f_2C3paHY=svEI|C^n%Nk4;z#H4p8lM5*A4{4~Sbqi*(F^AyPr|OfwV|}(7f`h^
z3S1t!qdU-n!_&*x-|;`a0(E@B-NjK<zBnjp!Ke87vW!+8po@a9vI()_CzDdEk-F(p
zF=$G2+Hg`hAOT+K5DZ>n?)U;y=0R^vmF-deqA;~)Z;>*>6i;Xkoo(pTBREYloaCi^
zP-dOY<K2T1VC~C+c@TeCPd4cOx!iyzms>RFM+muMP8%n;A}GQ_9<&wjovei9bKQyT
zHCZGL!`@Iv!AW3yM&U_oG969|mwY<EY8L23vOFKR+OUFO*vqKD+D59ekfYkmAW}*H
zfb1dng<M_}pM<Wrcp$?RW?!S$2}E??(VnfyI9{k7?YRm2(RA@rDG`FXlz>g3dm8Ig
z@&iFz(3Q?oA|gfse#%cn2n-*u1tk2Qu9}Tt)r$XIlRCYzk!2_#TJW!Gs@{<XlNRWm
zQZ<8760(|zTg$GG_C1-b&75?6Z3axgInlFXs6~wtQrSVL^P1i7Y0E$R9<kaN<m6P)
zX%p;|2cv;wNH09|ah@Qb4EWU3W-P_9Z>70cQ~33!VatR))=F|H^jEJAxCnIA)CbLA
zvd$xac@3u7{jRzZZZ70oquB98_PdhWno3aVy(1NRHag|}4Hg~UsFVvmi(7<Xflv*^
zTj@Cd(iho#r}um88+W<OKfZYWOLhtblL9K3gQO&t>S;+YK)RtKmf=-hFP51Ei4scm
zT;A;O<i|J2%&S;@?`>ZLUr$_Xkku`kzc?}*;!A4UoK*ZOPv<eMPN#mj&|-mI%&dN}
zb)f2y?^{ud$<;s4@~%E627Q^T{%4T~Qfy_rSt$2_ZczYbFf>>a_~eC>VGDG1C)nr6
zubm^Gg72k#Sff|&ue}KOppt2rC%6*iuYM3tsMdt?Q3MLs-A_4lhwi~!l7O^gpB*`z
z{>pM$*R+?&4h%QwC6b4)^%WeO<<ynVy`1b*iLGai_4jcGWJH6K@5vt#wKh#F+35aR
zS>(9Pi+AOCvjz1JE7{{FS?-KEGb@5}mP|HF7V&cQ+F!`w#sAh4?QWe8EMy40YAbI^
z(i&J{JEBa1!Hch==Y)qXt6)<#80Pi8!Cv~iu(v#;kGl-S_22RHH`|wJ-NZu-vlZd$
zOdLUnLDXEp82qDhB<h;JPy?bKR}$vSKqz#Y&lROA0z1<eNCCF3%&JX1Qr)I@HHPrD
zu&)*<f36_czm@`K<}W@}=f3bo>^K_*Nj6nwk*xeHvcS#X2=&XBd0H8v>!53NjH??s
zi%)@_IY3BjAkS#}8#=b;5ZBrHETrYO6OTkPHtf30t0Faxks#YunedlNib^-SfOH7R
zw_b=Y-yc{FzTC1`0cMt{-T1`ZQ}G3Y#-fFE#!16KLrz9NRtpwC$PqXGX&?Nzm=!%v
zM;=y`F4-CvrK@YD5gAKf#r0)2U1|28!g8siq>i3<UzcBl0(-Xxyc0V|R@8B#1W{lh
zPGtH#cx1%RjRd0UbCkJ-&40?i!8&q)iE$RSqi53~ZxW+*SI9aIroNRh%U$7gK*S3W
z;)PL))#s0*{wC@OL7Rzr?P6fk8w8#7&CEFX;RhU2(T77lArBC~p;QB}Cd1`EpfM3Q
z2=#sVY<1qD_y9f?oI*Yv|9UA>PKT7*bN-oJw!1NorzDdSmbcRpsgFc0uECq(yD9yw
z`oXLF+W47HJLc-<5vCNRacnXfyFF7bz5w0XQs$5WV=%0Q9M2gY%C?|m8j`{=JWcgb
zh^(hGUANWuQ~b?Jj?~5fv?Yag2PJ$@w}>Pp!MQykhl=StxL~(I$ScsE@sM!kbT;YN
zy!*`ynGg_V$K=aHv_>?qQ9%P8d*=<>LZ{6&_Pie>YXQ0SO)|DJ_VWvaI$13>JF+Bx
za4pW{dTjt&5+zc3Ub+J*3u<LgG5ju4imSwL)u7b#jr-~6LxAazQ+{;|WpFh|PF=Kh
zOdhY13q$eEHys9Q;2g@=*JU(&HSid7j7BPDM90bC_}3{0SFKGw<qi=km16W$5@2Np
zWhq!V#$HLb0LdKdpw+P~H-WBY)7<?U)Yk9OD13Ei>eU8N*8QzF>54;^xJFEglz_xh
zNQojoz_>jq@TP@OE|Dtm)HV-`hzc8#gKw-#D()F8tW%_+Z9oViq{BNyEQ47(e*R3~
z1g4Mp;`9@6|I+cafXVeTY=M>7uOM}RX*b%z-KXla%ln(ifv{F4zK*BtABOs-T?rpM
zZb=eb_C{B9b{-9*B|BYl;f9^j)w&5v45Rnucc3k|)Om>girj`2m|p4d;d(tLVDx+T
zz{c$zt?!AKluEXP8z~Ky4s(%~5_y``sOW?0BKWeIp5>cVZM7^FrgG#~0Gf`l36|16
zcdUEtft5~;R<>!*b3Qxy=I3zWjp%#A6XuYgRTpg<;Y7Ci+;h>H)qP0i(Qz1CsS9K7
zpda@z#|iy?gY<hU`k_G@)c~$C4M8`C3FwV0dWu$4rJG$;?b&U7X1^Fs;H|CF|KR42
zt~aF8B(LrgcNhvd*+OSBY5tXK$~;To(ACfF9Hsud_li~$bIL5H?Njxi#@1x9m2{g_
zkP(&z5jZ2~vye;w^BZTL%NjHiJEy-xq+O}yJoOX;Sxx2^vDf&ky*ylHuIAZ62V1$M
zlxqolsMXO7xEjj5NqD1+%6pd3>MBqb;My8YM#IlT0#lYJ_!|yi<X4M*bBsH)FX_pH
zqf7QVEAY2xk^A#gvie?8R($4<8uW+m_<}KX#?qt|GOL!LBO;ytZ=>*)uG00xO9?<@
zBV*sZ`ym070~!8lu<SE^H|mld#F-r<n&$)(JSMI$X_kXWravhg+MV|j+YjtP#>H4e
zymchNL_}p^HcY=j;H5|SH(zN8jBiXZ|17Y4U0Yyj<$bW)idW{ZwNA&6z7~_vXEJ~7
zI6Qc-9c&nU`!shUI!!^4W}I|EF2)^Zp9CnNV67vED|SUoTWmd_aJ|eM9PEwUF#Eja
z!0GB<pzcqHZ3!IHr`M-~&-^IFTnwYQBjiq5pV6p3EZ<F<)6{0?C5D*S@YLDNU9r31
zZY-0f9)Yw}S?WbagA$jrk_K%SSG@vWamFLQAviwGwB4|}+P$TnKD45XSCMa+f|9B_
z9=9BvzgB-VCZEx9lge<U@Mz7IxU}NU^jm~=P=ZL~7tA~I+He{9UMPJC-f3jF*;U}T
z;a+Ek#C!sCOR-G(*`&~AI*~$92^CpNj4atetzm5LFj!bHu0C(!@Q2Kj+QA{oRCd(B
z*&;eV+g-0ZT#{@giey!C$%@dXw<4nmnA}KyX`mbci)=>hb?|#b@qbRm@;}DlhT)Z6
z<FezC9O}Gkh6v%ns2ckC_TP>$+%H*tlZgQC*Q}Cw(>pKRZ=mk6kMP7wma<3HM5(aK
zm^c$8tiB?j=M|Ls@A->VE5g%!BeuLi>~D;F)~D-A-L<kH%w~mRUrleje!#FVk)wf?
z;SzhQ;My3JZ4E;A$yhHH%Tb<4Mt2I+6k$$nle=zd1uHVGuB|+p(U>oEc_XxfqW^^B
z9)ht2m!vsO3|6mA#xPKWB1%-6J`NZhTfQ(Iar_X?cmn8L(4?Fwk6{vrSyOX)y5;WT
z0_3}W)3y_SG;o!Th!R!%d1o6>MV+Nl3f;V7b2Ubgv^DmXNe={hBVM`_ZiD(puVZ$H
z@WhlEjUx*N2}e{$I(!1VD;K+I=#v9y5h|mDIXBC>I>SPNrEtyT8Et^ZO0XE|+v=xY
zm^+^_ATnx|ue-yR^hJj-*g5A^LDPvz@KmxE%4E&vW>mPY6?r?<*e<>%qY7C%Nako?
z3Jaj2!Bf_pulErX`CnJFzGnrFbK@U+hLuj?NG^bF98*!aUKjezUh>;mJg4T6W{MZ!
zH;uRuMZt3E!U#)pn$u1?JQ|ew%pPYIm_Jr1oDu>c6yyr`Sj{)SnMNk@2_3WpOHi?M
zJ5K&~gDR6paRySAWdYL^V;7{JW3`YyPtuf}^riphju83$awzsbEtaM4&9gqiH)Wi}
z^Q%$TB#lbUy#ZRC8Ooc2aHG=DLG`-^Ywl93&ZdxjL&{`_FHZQRYyIbk-nZ)NPt5Zm
z>W8wF6D^0JM%KFCI2Y%BU^cs696k5-yh=nUkgf9sTQziKd$Ze4>6Mq0QE^I1%l1*O
zDg3k6WeiL#ekKGIIR0?~Z~_0}0*K*}cK(5GdIs`(*kn4Je`>bjxGuoa5|q|^60GmM
zXh4cUEu3d(amXu=tt;I1Nq;{RDC7HK_q>p}ed)vT`1T(>B~Btz!j)^I1Wgjg8K&)G
zqzSrqen;ax^EA>EXv<1WE}C^Yooo1r>Wi2*m;HVPu*4o-3X{#y>;JwpPL<mK2oQb0
z?=!w-`GM!|lq`!hCDWte4;co#icgx+vNNIvooxGJeLtOJeBWRR%~ZT`d_IJYXTb`|
z9R){8HD(eJ$-OxU`}{axAQrR5>cz<oA-Ar&H5*X0K;!6>_qpI%QrL>=d&z5W^NqdV
zP}qy;Vx@|ihzf37d*c+-$kRuUot0UNqCXBLm9vDjN6%=|`3AuhxbvvAKqWW$;IL&e
zIgpW-LE9b&=Y>0r-Ta5h277Ky9%}*RcmK9Ovwbv6QY5xnb6wsl!G}|a7>{-oK2cI`
zz970H91Q&fn-5Fr)e#dpx?)Pp$piC7;12;Tq@u(NXTnkDN)Wqt*KU+ndSRAD_2I&Z
zSeFU&AsH10zQJc{bqyc+fP;I`n`6SbNR-IqGx3A!Xhe4|&<U_1``{Y-<8Lz#>I6V`
z5tzLL-|#HOH~rH$>~#JYuDokuD`y`78_t}gqVJUfYv%#saZAKfiT-_EZDrY0UfD|U
zHdVgTPPp^Lj@98qrg`_>E!s2CjcDbrQ5kUTmtx_y%F-LXh;6)h{Ttb)izWy{mS&n7
z1zk$Is4lXw<c}Z3m5pbW688Li3~5_Lv7zU!-*f((Ts;3vpUWZQ58bABj$n~HcpRKF
z;)HI5hUvsUN?So6E$0YqXLO?(+kBd=ZkV2L<h(>cRxzwYdA+3K)FgQxlrF9Fx%=$_
z!0{s|K(Nv)x=zb|U)A|%;+X1m0sIbGhK@|7?0oHeZP#d5FLbHsKr`pbC3j*G^k~Ku
zCsT#k#VMB_;_TRTT80eE7`YmJ3SQPYdNEW*?3PnF<Ma~jfRs47A2ul51#;KyCg&&l
zE8t<b>Ek@(-`o?WqJ*d!zD8}Smza@A)71RL5=s=cXx68X?Lr4T^12?=;&NC7!8GT1
z9x&GT<G_T!1)%ulolu1?qv&Izjt&;mBk(B!XYZfV2~5}dF|TN)i$KHMP<eD`7pD-3
zG3=T4K3Uv8wxjS14y!9SZ__m@*Do=bDzIXGLWa&JUuq?5Cd0gtRSFM>eV^98y|E5J
zgRJGw$Z!xUb>8d_8q6FE8EelsAp`g>A72ef^I3EmRxH@(-GtC_7sM+_>$hhSvX$>J
zSWca!4YZ<ssJ$U>Q9&4rbOC&d#qZoJY4?F=JL<ggVzEbUyNAPyC)v9^w0$E=cf>8)
zB`biTTW9bPUtx)3)Di@<BydDX$~gyZCw!UNzw`a}eE)V?skjn=pjY4UwVKwVX+h19
ziJtc9R?yAEDM|lWXvy)ZSTU+fIbnr_DfS!}c}IB;3y}Wc`N`a$hqp#l$x?1%Gvn#6
z9P0p`UJ%F6AfE0v!3aHK@wAw2AfR`CJNd>x+#m8HPRC|~DrEcJN$w75@-}_5pZ_LI
z;hlEUNCBgM^n2A$d4j$`#%u@a6Mm_n=N<X{V@F|qHVy9zA*I1Puv-e3mhWj&t;y@-
za*}KV8B8OPsl39qAkk~S2KL}2(CHWShAFxybmYUo9a^6&_)m`j!0TDS=*ql?RX80>
z$M}kEgfI!DnrK3)|7tJV#c^zfV&#DvmP`E5!;RUi$`7_gYm5U}(m-;2EpSGxU6$kP
z`cKSn|0pC#QY9FfW)yXnS(lsND)k<mPo8p|9OTi5=57Kf0{1bj+O93?XYJ<qCg90U
z;7B^syis^ObjL8)?zG^nfKZ?A8X@*aA6%RV+H@qlE?Y%H?VwJg;|R1R)j8i^KV3hW
zR~i6AYS4Jz3UTA=%nNMp6O5Qy(ic<J4Rdd4IMoR(@{psfcD+f&ACTu;3abNzTJ&Z{
zT0x`elH4Nv?N|11oS*zbY$29A{f0Q?&HI^Ss=K0~QCt>|K?5Ixr!)`q_Y-MF`Y-5v
z^V$$gj_$=3h3Gi?rQb9y2gwcRMKwRQbg94KSu$AurVkv@mfPvTXk$8FN8WE56ue&j
zr1WeWm}_?nQOiKMwXi#yt6{D(@~WT}yLC)ZY04OeYncXk3h)3v=Q=u`1T~TrNO!54
zBQCG))`{LD`X<%Ch-ayZrLC?;X9X{|%8xdE`<h{mMAzdBJ7ar)PAWD#d|DdEa0$4!
z|BdgIlNmYTPWL>Z0T8%{G4;CT-TB$SleHSp<F@lR$YzO6ij^a!&|=vr%>%=zF)?Vp
zhPO)=6#@?e^*)cZZmPo`!LZvU^UM08$V0j!IELDu=X;U0;8}#sW@Vt~HU!3x^8m9l
zc>3V%a_B!8Wasyi7YC<Y*>%3zoxhCEu^7$xZCw|sQ2cUORGc773~8=Uc3va|q6t#H
zP;d1j%raVgRqh%f$MpzG>OhAv=t}fdiMPS?lsj*3(^iCtSrVbw;FLp43jRQeN^zdk
zr!$%Acc>59#I-Zk#Du=H7d!m0e~$hPj;yn=hDop~=quEUR})nPdKW!ps&Tr7+Ajr1
zk3o5c0IMK$2*2MlI6d5p$V92(AZZVfnJ7c)G%-E57?f84%AL2NLQJg6-xi+BLXV`B
zlYQkRC5Dl(GC*x_h&F5h#MGn!*sSwLnzDm;)T0^SY^aqm1eaaI_3Uhg&{@z6N`Gpv
zq-N#$NsPElMiWswHGCiPTAX?-PdP9fB%6Yi1E%A@HbZ0S#_oZ#qnaq<*%f`?T+aeO
zHkU1{Qt`f>l0hB)v{2`v%;wyFD~~O+X{gh@#`K6kQsPa144C|n53;|YEX{YzQYBI?
zqmU{Q3`{@E0aJ_h>dabGizZYu`_&hIPRI@EN4zx;?fVGdbT@^_5v5R0`OS&(GAp1*
za-q;V(-SE?x-m*dE`+5_^mv3;!7=be<igTuO#3SR)kRK08?a2Ip^}owm=9+qWq3Rs
z3Jxe!Adb$ik$~Amh>EbOFq3<UpZoz2{}`k71M_fJG8X9AkRej$*o_&{OZ}VNrk%XN
z7H)B~K}@pywQ|dAKQNWsN{A@ZlL})o9YM=~D@02GBwJxx>i8GY!R{~5{F(D_JuOKu
z6SXkDTd1p9KBO?OH>i2sms}@?3tM1PsuJED6aBhzfvI5;)?=Ifa5Lz6Ub@P`l76T+
zG)ZJBmT1m0Yl>9vQ6_M!he5_&z2qi=vP`opszr<#cxD^t=yenfTvmxKOoOB2n@^bi
zFo#AxYL>eS)zt0Os-s8IUv~29bE2srM$)LL5+^%x-9MNWU4^(0izNF}#;@d!Uk9sJ
z`kvhv=te9AHJ}CK_Xar$pOK#Cm~~19ekB(!6EBkVcZZ3K+#m8scW@dSm`;tZ14XJ!
zv6<_ES*c40_Y@?^CE|}zySPdv&_Xu3e|1%^t>)N}l{dj3>89f)7e%H+q-A~wA~g(R
zjfeJxP+$dI8=z!sSjI%MtmTPO%f-U3&ZzF@1|vDKHhUT%OS~8+_~t$jimW$1>?I@l
ziBw`Me&2%sw&)uc%)Tyo-N$T>OqAW*3JLw#5veNVVd6c9TXkvJvBj#7%Q!pFtT&<3
zQHee#4|#WkI0KRp{Vk~Cnf?2S^3r*afiaD4I$Y9~tBTA^+g?7vePndWxQS_H_Lg2j
zoqfW1_52=$-7t~-lJCnWw(m)+HB-rwG_m;fbZhkT&!@ux%3_fyS=DTLRRZ$Ok5rlR
z5$b4*XVxC77pty|;N86jC4#;d!D{z;vi+m_$(b$UU-b4{DCUYkg85#QdvOF(>}NBU
z`_(r<t&Lmp3IlmJ3v{5_ib?eRp<VY_-q-xbTwo{j=F**hd7g(KYc_L=BRQVCrFxk3
z;<LtQuE8Z3tVQIJh#h(@Dn!!uJN0I86bz1EG<`EGA%Njp-bu6(qSSekVfe>;TxB0Q
z+3moq61W4b?cUg~XQS+!Z;WEk7%Oya_BY0yFgsy4LEp2BH5rBdUH`ZW8KQ`%4uVF0
zd{cgd9o#bX?*oz09v4}}=etTCqs=C^`?oP5!m)QDQ>MbiD26p_^UT@$K_m48<AF6E
z`|S^+*`AA(_9+K4U9ZftEs?J3WqICVHVIk#-C=v)iTyT#5Z*7b=PfX&qr1t8#51hy
zv*<q-_8xhdAP=f7T=4As-3?z08IA@&Y>y{DL{zD8WgHdTKu<Z#qRzM|$aG4?;B;}9
z#)!U1^n8)M&am^-To{l+;f6>r2BNhAG5b0J$vQ@ucS%Y-W(P8=AVU?T7GuNM#{ga8
zY-3CUlX@S9OM!%PG7XBwEQTroliSN;o^hSs>h?La5+fP;WdUM9Cal04hf@ZAnG<N4
zz2E}zi-V?dk&fnCVTU)O_mfb##tl(k-*gQ_K=y+@$W`nTWucXm9x!qS1!GiM*ivE=
zc;U%dwxMk)DEZts{oOkQDm^cdQc?|w)Y%dQnGp1O!`6eOE#F95TQa?XtnXEhs?>v2
zm~t656quasj%W11CA%#^qUKD#^6jI0XkO+-`g$kAUT?sL&@x7;KOyMg0K2%WJTAkk
z#2P`0U-<(jL;9Bi62TYHCg7DPRby8SMyL7sZpWiJ2}7a89X*cbmb+L<!S89P9q`FO
z>3`gJ6xSY7l>qf*v?{MdTc*`v!iAsJhT(3dgDfG6)%T9OsSuEkmxolvr+w#9l2pZ#
zD~e=UTEJFs9WkII5Q#7s6ucU__}A(jkG0Mh!0MGJtQ}p!s*mK73SHEcGWklglu?4L
zk={;&SUghUqHr}9oa$Bv)JWZ%i`|fS6o;J*miB8b6%F*N^hMGCz`@z|di(MsvC^&4
zDch_(ggjTAw`of*vN#R6Ej#$^S)_gJo0#_=x~yq>K-!MD6XuNaxRL2q&q#zjQL#}Z
z<Y%;xL@yv-vOr#dl8rP^xdfSvrczYH@TCX9+1VXgbA0f0e!s^0^8Rr8N)|j_F+AT%
z41j=ErZ{yp9_;`=xJ6)XZO$MdLU8Z2)!tB4I|Fvs*i81#@$;MywIs*YZV)M?Bf4Hx
z^%?I9NGi4=IEe(7f=Nz|WMEX&m5>v{EpAt+j1bi@re~BiDZx{@;S=<nn@gG%2o!T9
zN*r#&6}(a?4c8e%M~y?PEd2b=pmN}w5_B%SYtCCoDmv;npe>v|9I4oZdg%`Fe)+{l
zL{YA5e>LNViY05Ws2c!-iD+po%DT7gA;@j^nLUlF2hDb?u@i*gp0OC*;*jZ`0!~Ep
zg*%2}9ulIih|SpZ3bb!WV3F&73%-}0W?}(*53U5WpldS;2hfJlMx|9gOpM?c_I*U1
z4nA5BbQw$$+=SmxQpxp6qovg-5sm!A`#|yP4Jc&AQ2==D(?<~&MOu#a<{gMy#XLB^
zA-j6|-{q19N%jZQRc7)1;F01Lsuf5Am*=0}PxzeVjY)z$J+n1$h@C`55Yvvl{R7(A
z!HHnm_m?-zQz&a-wt_g<<^H#N?b~{-7gT=|P1SC-F|ALPV4lCY;<qA&EmFCQoybu8
z;-cr%yM{mbp^EjAMMKw(*(6RH7Vl@bZOcYRuZa9_5dReCz}YTD@z|zno|gEcxYTNq
zB_)Sv3${PwlN)hhf}$6J$$kb0U>Nvf*o-!(DT+nx-H)HedpEHwM1qr0073<~dZpL6
zBivX{<TxLSN-St40W@yy;4U0Akx-h`y5!hO`d&D0tlcwz<k!6E%Zm@@d1-)Uc?1MZ
zrK8WBAqs+`#`OH5TIr9zA8SW5e9Pn9B7AdzxXV4;1>5i7zLy<bqYCA~%DDul+@7L%
zH+fY~;xdW%H$EhZ_ZoZC+ag!Zlj<HJ>-NmGB#EJi<LM9N6|(5`?F#93aI8**l$HMK
z`&~6@Iy4ggBcHK8)Y<NI8Ku9evkzzu8GhiG+2=$7V$hGSlxLD0wZODd`PtwOQkh#Q
zgD8P5vPNu@`8w)d;#IGcxZ$a3r!G~gh;fod#&y5==Fq2|SEGX1#t#7_N^WFB@bxHX
zP#G?4UY1L!BZrcwf7_TSK{-W2%9p~K*|co<(O%!-Kld}YJB_qSwRg>}76_2msT8f{
zmhl-k|MPDT-|H;+w#`_W!w@`YYDOhp)*6h+WQa<gb_R67N>X;E5bx1J-j7+t&;8I;
zE6!@Dv<SwC#1I|3)azPL2QOu(;l2UOSnS~2a(1JVGYCj%?TTWgSa8^$ZdbBk>S)^O
zDjV$0?Jl0ZmbIt|2JIF49e!9wXNiz|a399U<)TJpBh4C&Pe9$d{8R}D?Xc3XJSMX8
z5yrjDp8+cq5I2cr;uFuz6U!PoN0Mj^^sEb?F^;{t9~9xlHWj3=HTEOrK*)78&3V`?
zREY#c{<<8jVR1Z&Y%?%&d^P5PlJMVaN>G4EH68ZZkr&DTViM>f{Se6_aDT8;MKumK
z;R13cNsSAGP3PI<<H4*eI&LKPQ&9JH$)Y%*J7^vm!CpeOB$s3%!e3c44VH_y)b|Uf
z#xoL>hF+9M_A}eer|}%e!?3nO_IOa!bz$9Iasl5y_Ib`re~~uZ_L_!PYnnS6aoGC_
zP^|#3*c^X6Fp=b%bP>w<2&fGM`g^f^7Pube+4R|i>NJOIXfB%Jb2T(ee*l|26XJ34
z@vkw6B+Cz2G+wn_;k0YXtFYC4Vje#=us7^-f1yBl;o`KWw`k$?n768K>1L^_jff0R
z?T+B>oFBkT;4q7gNcsG}X?)yr2_|&E-fW$=tP=<VgxIK&8JSt$jK<*Jz|r%KvPyCE
z8dlOXBnzYrTv<5Hdc^0^8z#LOJ0IkGB^_1kpea;Cv@4o%#~fpmSa2n|jRrre)OJ)=
zi>vL9_I=82*(e}0mNC7k%&3)_358^&$!cnNUUps`w>_ocykho=F>wh7szXfsmOC>G
zfXlM?%IAb+!qG1Bj!5eVcuT3GX;la@CtzRS;>+RgAB2!j)CrkMxi-YB8MYZ*YtFQm
zRkvF<=u)@VnnOw+xR9uG^@jly=MzBkr~q-viL3-h4h<jH6#nWP+~@GmF!BM_NUfmh
z4D7ZkX_SA&?yIoiROu$mr3w;F`*lvy7tQ~o29q<la~c`of^lb6siH$*bq!wqaQ63^
z#*^4OI+|{TjJy6ce5wQ|=MYQ-j?#A-{J5$K9sZ>MmxxK6a#1q#>STvJ^!IB|*a}w>
zDlZ$*1md01(z3j%368@*-Xl8Ul%N0KY#vmz9rV2Y9MB`5J~_`%jtX1Ak)W8;RLA$*
zwZlPVp0d=kH)+}u5ux+&ZJL14KVl!YJU~KNpRiPZ&Dw-qpmHnd4@I60ab|=eOY~p?
z($+UkC~L^lQ9NH3tixgy=lCdW=qdO-_Kunsyc+NM{mEWRFs3z(vR@7<dYBxxWsY8h
z+)J}AqneWYf?V**UPN<9Pc;;SmeDuu7@>uY{JYheG*h%HL+=C#$(Cn)vB3LkZXNZc
zL_j`?yJd~Bc)xC3d1*71+2bo`Nef=QZWw{A)LcN&9p*Rm5av(dUSnS~mIGsg($OR7
z&8KS??3fhCkRSby<>IiTV!^~ATLIP%sYS|h*qlkzA2~x@YU7TObe-*<MrA%?O&}MD
z1!dN@^>~)>-+DC_De`)BR;~fh)M)8Y$BBd$9A%|SYSMoNi*nDn$JZ|?FG0>_(R7c`
zPP*QF?d+`Lx*yd>``lu@1sXrT4GIu^WGO961>MBWgwYiAs71U&WVp$`?@pou{xzxp
z4<eSCSAy6d{+Am6)W40=mbo#aa|=YNCz8MSP&U+_(Dj%>*+J%l80L-tbc9(sDOiA0
zaf?DqnvjO(EVHw15=PaqZhN9spbfJQ51Uv;{J~It0{`s|yDD36=rR5HAIjS~p>^bx
znx)zd{|m8nIZiV+Gx!k7W@TB=H{W2uE5V(?M;qME7nS?&8w=|RehL27JTq|#=qz4O
zpx@2I+M$6c;D^5WO9OjkdcE<M!0G35l&Inbt(d5y;DBe9`eE2sB+ak)&fp+2X(m(6
z?AXw3K~|oXRLB=XA`O9Rn`n_(`P~Xa@i+U<YSg|d99C%@wEdv1MZb|!<8mxC&J=~a
z`7Bxk3+Zy+w^09#%`a<CimB*&?6^8hD(DqO>mElcxcWU#S034a)3ah3I1h#b@?k3x
zZr?bg4;VEU!AQ2+#V_<JvF6(J*J28^PE-YTkTXi~r=fs+Rof7nD81J4q)u#t2Q4y+
z3u;tECHMBnSBLs#{qli|>O7luWSIy7<+7VkE9E=FMPVj9MdpDlfrjdn7CZ;x!%)(A
z#TK}}AGXhL)YQe$Q1}qx={=2q=Wg^of<N1I#$6k4(T<BOvu;d9Pv&a@gC2G@6PSNS
zmZ@4psZGtAIRPQKi9jX<ci?bk_$-Ck;zj)x7}rSlpMrtabu>CK9W8+`d!NyhE$%`e
z$A=W^K{>kn3zuq)rF1e7R=EN=kWDBMs1-5_lAEG{+X<D^SA@4;Laa!Bv-d6hN~Mw}
z;@~vbe;b77uz|<dog1Qwrmcq?H)`F^wEyu2A@gY3>MpyElNRci6yf?eA~^?ig_=RI
zVa!#;O|xiILM01qK}t(T;06iSOV`F*&aYA6sT;YYHE92`n3PsGP(2o5wdo?%?dcBE
z(w@`m<>M$sNy=EJ4aQ5-yV(YPa!rK$9Ltr=0{egvuyl&SID)Uyas<%rESL{O{iD7F
z#npA=X#7y=aF3GHshiqSbCf4;ItR^!JPGH>PR$@w9dr`si@~7$o1HSBFd#TbPBHsD
z6`vq;vb~r<2z~cGUt6?9QNj(qe&lhbgldWnt8)++K@md*t2rJDgJsZ*_JDHe$9oWZ
zf(Og2((8HycRG<&D5kKooZw=zq-3qBidjOZoV3x%S*9FI9UJsDWkw{XHT0OdM6{m+
zwMlgxsV?Q%DGhNNR5xG9{u;IJsOau2QZ6=(;e){J@?p6$&oNzIp0%D^A1?_CR*ufL
z&}z~5>6z85mz^!$$rU(V_CgA{YK^YUh*|Kp%(gIjOVkLk)bUqickx=D&akT!uRhs#
zS1+-SXV&s*E#>0>5a1~e;3cuoGpPUY`QmSyRNpGoF|eNN-CU3mw$|9Kwz#K9xN#3q
ze|U<P(cWm$2)@^(<kGPFecUmfMb3UYWAj@hDAs{@iB^CPeVNBhRXvV{_p|i(^37jJ
zjY&HP=QY0-v${r~nn=9Qe7D-3w~UBJ>!%uXe}^xA<r$FY<%6PzKdX$yiEgQ_4rjyL
zknh-~MoFwtsNe=G5xg8$`}K#u3sp1p1kYwfmim(GBROD=`J0*)Ep9(q(N$g9vnA8P
zFqmoQRF^sRrfUtYM&xhaUbZagrL5Z>1$h#4J`Y$vZkZfmC1@1U0RGd>oD6A#U27TC
zw^LTf<$@47ELO*10xX$_CgbGE=?fq3(zmyZ4gXK!A)1$xJ1!8dK0)%0Rn1bexM%*U
zo`BN(ZJQZ?-+4;ezb0BgZTfQ($pmL9Tlv*+$EuksygpLjv#4?I0P5V1>IJX3ZW5$|
z8(aloK|-J)ATSUlsQ;OO0wY8U6a)eR{;$OUQu|NA|E>0aB>&Ue|6?Bt>@~+=a0m_^
VO&d1z-`Qp$DKUA`T4BTB{|nfHS~>s#

diff --git a/addons/mail/static/src/img/feeds.png b/addons/mail/static/src/img/feeds.png
deleted file mode 100644
index ac2293c0bf5ae591a8a5e4bd404a64a93f578ccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5647
zcmb`LWl$81x5h~cX_uDnl5Q4B*#&m#SOk?^NhwJ|>F$Q5OJD_-5)cuP+69*GkZw>K
z1oiLxez-Gt{-5s5ojK<`^UOTw>zO&f7=5S~IVlq<4h{}E7^GqNR|o%TVuHVu$iRX2
zui$zaYN_GWVju4PHF!2US{gWiqLPNc{B<PmAea{p&ix1fG%ijqg5jSvZ!koYXo-ND
zR89!5jlC2Hhc*qYp=#{6aFl=R1u*j&cwG5Oi>sIjghv+VKR4Iw;93uR)llo=Dp;j$
z@_XYhxq2BgV{Hp}MKsUyBI!49@HoPdL=#Hw-$y8eZn2-2eV=&pNaL3V8q4J76gZCD
zT>3w@XyTo?uK~7GCEzwB;Krj7z@x#90pP~G(};bip~9*8Z?UIvvQsC6sFR67WyGL=
zlmBmF3Y~d5Xvr9{8kUaPWuh`kZHzd#TU+rDwSHh3)eh~E(&_V>6*HEN;MgLkq+gN(
zXGnJLrW+D?4j-3hLIg}Ak@juu!?|@u)=3GKbm41{cX!uX(>YC77P~^uJI_&B`fAXA
z*vcjW+I$K<hvVOC)m{eJcHZNNzxzXIHz(hV$)YHLacsX<P4P<gl><9lxJ0iL9gnN)
zV@aAz&8rKwVXcCik#DLgeqYxK0;)a2%^jx_1H8VO<u?`;v2O%++Pn>L0bzp_wyT+W
zsV{c=CVzBlj$xgr8>hLX*S|AV%;d^wGCQXhf%ymLUL=$|;%*WZ5M*eifgz2DY^7n}
zXVs@uYEdve%qe@Ep|*CvY=^YSJ0<Z{19*9SYe4xLcyAS@P}E<B8_s$H_2>{{qK90x
z>L>#Ro#POhuXS}s3R04pt&V@n7T0|FDe94);nN|d%Dl+U{j#_IBSmKQJQvAbZKMk4
z?jCO0t4=7oA{|dN)Kk|Ft?z0>a55Fgp7@Kgml|J)i!QYN78zCz!fP07dOnqy&#4ly
zz3_<9q6j=zHpAdtRL=`j`c8BUqBOB=@0S7+5VLg5nEXgl?&9&Q!WBR^2z>F3{Xr)}
z8jes73IJ^Xi48^c463g4SBeFyk7D%0M2Ma!TSv%r65iP2YPhJC*m*+Z{2la(s|=nj
z3>szu6}<QA^^!uDKnc}VxdyX!wE}!BQghb*2gPIPbDR?3lRXuH{^wNpcukyk@7*5=
zpu*u;qoCVd#s>=Tg0H3}duVh>;m-+t!>iZnJJGSWv3+w45Dd+L!RGnAbr$?EIn8{M
zRi^W6YAV6jj@VwVhxWi6Pw%gQiDW<)Faur=MrYe*G@j2n<g@Wp0dh)rds}PTFXwA#
zX@3XWfn;9Xsp#sfsdX1$#-seSUWSLm7KGg+gIG_aYsG(7rA?Nk+-Gnr;^7x6hW9&9
z446_nKAD6}3N&}=GcmEy(6#o^9(yHGIF7ubR6cTVe~#y&MV%bmzN8xy-fHlUb?;yd
zlx=)jPR8!_$UP)V$!^j35k|~NmaK)1w|&R=Ks+ji1ehSGv#4R^F(?F;wW|~x>#9Ml
ziBry%zTy$DLYokd^V3cbyP%_Y?e^o_^Admvi*f0_Y9(Z7_!(lILvK!I&B2EAw>$rP
ztuhmeS^+2ry8;#Ab&LliDR}u|7Pt#R_sTtY0Eu#bkPx83T@ofn9(T+5sUv<lQYDr%
zg3W}*ae)pMi(F-RRgY1ioaaK-Ne@8<84iYUpJf&(i`K9@pF^;wlq9?R8L8Xi6RnY1
zuubl7r@)1oqw*B@S+ctANl?A<_bf*O4P@@P^z5t|=?IAXq54$e=oqqo5Wkb-Bew1m
z)Bm_dL@i1F9;2=2_^)aKCJr9y@n)H3nyMRhB0|64XMuKIWLf6x&OT%h12m+HS*D|G
z-{!u)t-{yv7v7sxYt$Q>(rf|?*)WHbTAYJ)SLvZ-Gtz-W68<^QPYJKU0$nls`(l(%
z;Uf*xtD-qhDuN_?oNw&S<#h5G9n4igFH_i?#_d$;VS)YvB(0O>vF%tI-@$PJpls!2
zM0nx7MVxLOX2P_QzU+{}-{5i{wlItu<ZNup;c0Bq3N?rz_+VnQ6saS8O8B$@v8Ub#
zP8+g?u!{-TVTZ+sr;|!vB(bojr8e{`@nypk<x2yWq7@Hg+E&aWZ8DgbtVj532_n=G
zOm?k?%6ob6Bw8vI3&%o>Ecdf}+Mtk7xY8D`>$ZG1I5S&1fttY5UUn@c0YWgsY3Asa
zQ~;^keWyi#O2lLCflw3G!OKwoR#>$VWC$3Y-x6>ZZs>(&9-<&7beQ0fk`dbNR!Aae
zWkiKsQANQR60K)dR{MneyeUm)oT8?${$7he_8z4imd6xvAZsj*tOU_4SaNUNPe<`+
zvZu}_=#4dNjHH);`%3$@Aw4fyE@F{DpWkqis_f92Wk$Y_8JV0%FkElG6s5Su*&|Xk
z8gGz>IT^eMt-ahdeR>%$sq!$euinlYJv<Cbk|-{2v46THjUhK)RyaUxi$KR3mj!9g
zcYn~ZXHhBhiSIl@dVCL@NHPCGRNF6?x5-=5&>J2$o6S?HmqZchJts?n@(k5Pp$8>2
zboSCtvj;l*orf2LwMbeiY7;>Ge&iz}Mo|L0<M2@_OERRET92@Z#f*6J9wfhYnTJqd
zAcw1&+?%P7HSn+=Ez_gi<|qs~Y7OD!D^^MKNYd&+!we4|OGi!KgOBDEkNN`&8-`ee
z0P+GkDe0vBp`pqo0s<lnO-0*Ky%dZmklr2;E<ybSjq#_G(~M&sowLhh@!6XfYQ?Np
zL`vT-ty5>gIGShRUCLHN<eM+0;Qsk}=lV?o@wXp34&A0Jrg+NLd&G?{nF=eVw`ppp
zQrUtpEK`!XknS`i6pw$z^SR)<8cIk~73m5}Y*6P}u1g$Qe7Swsw$Maua%TJrH7XLY
zNnAxjo7eVk;^Y_?=#XvgpnDc!d)Yv7Y0}HPOB<`1=@)V4a+1uq;=IsadwZ7y3C6@)
zzmY62IoioEU1#yR$qk)K^r09s<9P|N`gth%b;+EUY~c8k)!4w7D2Fx~HB16+?6blr
zo!K&Rm<q^esr5)iOlj=Kq)pY)moMB&kD9ZQMAV{Pq0sJOa~yC#e)Qt7j5c%J0F7(y
znr%mq=rxbflWzXos;yUnZ-zzkEC2%rW2RQ*q1`;enu}zY;lJJoc<IL`H_9fwYt=nX
z(vSQcGr%Aoz$#&S^Hli-3B=(xOvr!mCNa-DKKv#8l&<bV6(4ANLsU5_v}DfV0~qvG
zslcO(ER%KT?k999YN0U<XH{bZwRS~yfK}D3jZHHwzrpiIcjre9oAublo^y0y6Bf+%
z`Qcj*B^OeOT*lTVe!5<10T*u9r^}2B=T$Ga+pvtCHj@n<_2Pf<+dD>S1X#YO^*O)i
zcaHwDN`0lJ+Z~lwYV^LLiQb4ZSnc_<4uSI!3&o+R4y<s*e2yXGbvU^j3bMk$dQo!`
zS}|H@?lfg=w|<dK;)3sVY{~G*Y=VJqj5j4X!B^hRHop7Kw7RlQzQLsFv=`qsvt;uD
zuhS+!j$sy+{fLVk>I3lk0O1(nDIS|U^{|qS{oSX#oIk5=RTxU4^UR$uy^EV;#HN+3
z$xa)f&+`uHYgdrZ-`kxw?pSx2vcSmuWALmU;%_I+3eB{5*79vwa9UzYDM9qq5-7f(
z{?+Q)>eYHL#nu;*m9=W?z(STwFcl5!nP>~&O2oJ4J>xbhzQyB3K^iU~0lo;Mgfmr7
zD?R%#wIeX(wd?)dhY;<!8cV_=XU|>|wL-qT8OMsE?Yr0`0>#mYF2QE>IKj3$M(EcA
zhrz*Ycmd&p9dF?xXR&k5{xLKvV46$SD0yN>aNv5-`-|D(@hLs@gmum{%hU3pyXb<{
z%)HVz-&UUV-Sx#MRz@Iep3xPRAx)<Iki;3luIU4}zyOEqy-c3_lAe!#$oz4e;8>_o
z{5>du%@z#!75cv5z%%EI`)J;jg2cP7qKpr@C9ceb&FHI_3y5`-%<Rg93N~W;18`SE
z^z@EZz?*d`+VU=nKj?3HZN6VfKpk@%l}grE5$*v4hnMXwMcSo16&Qp5Mfs~%G^Eoe
z0VuJd8nc79abu}A4L((#C116l498<VE3fMOlt6Yt@Qd(SGq6ib&3?LEbB&Vrr7bmJ
zOs#Q*;!18r9y?a?9kLj@SbAXE7g0FA;jE>~!{50M$kHMR;vtZ|rn7gt)OsXle5s`v
zbGn~{iCWlrdmaDnEP9xPeOW55|G6ZNtD8F(o$M$DRE96QY%_uK4ovy@P1`_`62E%2
z$f%xQtRgFPUEtO*iDlb_q?@L3oND~iX`WKOAFOfEj#S)(rIxTsnrs?@r(tdk)4t*B
zRPKtnU-LAA?o|>8zWMt2EFPdc3bt{L^~~gSHqz|qT5RI?r4ZOqx}$&U?W|5BCr%C!
z_DY$#pRB>y7|t(xSuyiibHgA9y}UiUBtyls{W;>}dGr3eDPp!Cq%jxYFv@jrC684<
zFHc#;-K^YC8P8Se(<e8uZokyda1pgl7;Od50^-tLE6;eUW4V4OGA^>4Rjjjlep{5=
z(FWPKK|LoZly^%@8j3mvVbi)nXDP|`N!zSnY?Cq*P<i)lY6=NgWFv&ch4oq;t7H6F
z3oajG4-yFuN;x??!Dh|9wpRJ%oEHQm_{!Tk{?ApX6KXyi2RY_`TYE?tkyALq?c&8J
z*BCw7cS|ZnBxS8@(sCuHoK^VpiZP%4&CtLh`$`MI5uurO;x$<;<n#J)$3a;cajlDX
zJmdZK;)fsi(u#hc`m9e&ocQp9pDyFo4GYVuMg4o{)C#$g*Pa_0<-83y4`5wMOuCg_
zgbupDf@vi8Z3ziPx7I3`gNV%M^UFFD`0I|8eQ(UtwwRiFrOg~)*5*bNOd1uQNdp%<
zAS1Je+}y&R{hQfoBm%XlDq-0-UgcdTGV3fyD<egBA6_Zcxt$R;j!U5oVm>)^oYy6u
zJhFm^5gd91f}F~#Q=4vLGSKK=?gu6?dqdREao(2qOup%}{_h9pD|MiSFy)=67UvMv
zYS<5qW144*iDZG1wn`z9k8EjP7n>!S2-bZV^j^0vJe^GRAVTw~fOXx)Sii+u)d@Y|
zX;;~S57uV8j()vh`T@KeI|^H^dq@u(yeSyqI@T)*A<WD#+enF4-*=1)X#jU2p+1sk
z<xAf4A8Gs2!-2{&nPnDM&qh}rhCK^5W`-t+M`4XLv_Inj1OE1SitnB=h}J9()ld(;
z^te=v23G4F4=ZE{TWx%Ct`QB2!^t&)E^^1K?KXC^mbS0J<*;OXy|q*EF=_R^f;x7@
zK`rw(lStj#_qKT5y+ZeVZ&JMwVnD8m7ayKTjxrt_CNtKIt&8im?n>!{KKPrUhVef6
z#H<4F*N<WRa3WgwP$6V}Py9)`XUlbnqLS39;aK@|9S39d&+ly`QQYTvokp+E8BP86
zr5+!i#+!BPZblYa+H@m*b1g{5am}?w_wl|r*pRtpaKaoSXx+|uTs;FEl*LZm?2YBy
zul&;<0GjfHpP50nk)ENI(6W;GG95*+IP=f1LfS|w*7#nidj{GU?7$HcB9D(Rp4Vff
zgQ2q^t)Qw?cI2BLb#Adm<38G0y1I#$XDr-G#SgMyKjb#BKxRijt6-rrdqSGo)*X6M
zWt@<2<=~%i<{k0|^x!EY!;1Cf!wns4oBV~z;m|a$xy`moNrC2&PwAms;t6#SDMP(s
zDP!2jM}vN0lRmpoVDkDhvDrJMI-AXl##7e8y`~#F(fBHbX~T=a6P~#|fRCuHRV^Sl
zt%><e$cT>v)3)f6SU;%gIhk+5_Onh!e!zcVo?O)3M5##D&afWA?1<_S4pS`-mnJpp
zA)Q1x`V3Y`zb<hamoGzDbGUOUoVbx?dc@AB=#FzQxyIZ6ysZVmot`bUyNaZC9a&0w
z4eNb0sLWg>lmoLJ9zI*f7@yYnAWZz%^dNIKrKkrl#X5O65hsS30;7BK<P{fJ=~p-C
z3i)5p%11LEB##85uR;KAM^mx>Mh+9|X`(n+OrK4Ijrt^9X%=I%#%v3Fyvhz}fO^iL
zAP+&Dy>Z`TCw*-dy7R96JX%TkL%xn^@SwRY7A2Z=45Z0Ysy8ek+_>$g)_MH10$0@J
z#hf&z{M^e>WnO;%r`5DoLP0L`o~qwt8vz)};$ecjF=3yeGjy4Ijp#rQq@QWVw`rRI
zvCnWN0S27=L8B;`D>8Rh;?<aDZxVCDm^!UdO*GD2bz8~<jxa5=cW^F=F`P4Ab){fM
z30~2m4{2F>^fUZ<)MXx$$07TIem$Khm~$#wRop7;dW!8#+(tV0dQ11&sS!dZ>0sPO
z9cLQ*Y7~|swlUTvtTGz>`O|@z)je<BTy-WZbNnBerk|4EP5UO~Haw3m*A$ycd_1t6
zFFs-*9%aYDj;fPu&ZGzGH*wcB4g0=I-g7dC_g{vy4C#_Q!xQ0K5p^}9=uWK1kPlV>
zDNe#fi${T-&ES)!?Rs8f<~QJ^Vbk8%tBGOuHWK#quI5X|7TG;@b1LG50jfM^z$^*;
z2YW9NgQq#CHLpD4Zn6D)A<fhaN?Vl3z?cUl=E>dWYP0A3k?o%`iM9Jin5uK7IlV)f
zE&B&C8vWb$(~Ao@GS|_fM_57^%ak8{!9&aHcOLkDw~^yCx_Ol{&F0H09ZQeW35>FM
zbmfC8&X0*P!XPMOtd0Pl_RTA5$kHK1CKo~R%{@s=NmhL{>hV_u{myMY?cYn|!=aU;
z@Ko!79X>3bz6rohmAOZBkK|OD*~L8$MmO#~FMa<am3o;Ym<c7-^M#k0!=NY9=nn{e
zo&NZqOK;cE!i%Z9?>ZEqCzMXIgOe>4X36+g1%@l$4b>mv?$ICkX@N-TC#||}Il*;P
zgQ>jsBR&*S?2j6;drj5I%nQd}m@UUPrT*}ktWL%v)~ay2c-}w;+N68m@r<?ID$N3^
z5Hz$+5~^M0H2f9I^Y_Oe@}^SYeRO4;i01;aI-IkY;C?G@`MTV}_3bV%`1es-@4OH<
z?w-5RMa;!*zlk+lT-JpGuqh|#wC<TBGB4eNSs*HtnsJ>~JqUPIKbrO8SYBMm1q-2M
zf0d#z-3`|0igG2-Sm3^6cRxJEp5ruN0xLdg@J?Bty$vxe-u1u=hvbr~NGNZHf*<VD
zJDAK_ck#~_U%<B6a@a=YFBq<kip)1;9S$Xe9PP>kLq449S#mNDU0$JZIS<bW3+pdv
zz|l|Sx}|G99=h~-k>bRhhtB_R68SH){BLae53~GlZ25l=<HiU_{|^kU2>VSxjgt-g
UNjnbxOKfq#nox~ewHKlP0Xin0a{vGU


From 28b3d3eac4edcbf30ca8c8799bca3cd6e249ccd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 13:33:58 +0200
Subject: [PATCH 373/397] [IMP] text_html widget: cleaned a bit the code.

bzr revid: tde@openerp.com-20120720113358-y5mt98w1ug9ljbvo
---
 addons/web/static/src/js/view_form.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c59af5a9307..29ba9060345 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2320,12 +2320,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
         this.$cleditor = this.$textarea.cleditor()[0];
         // call super now, because cleditor resets the disable attr
         this._super.apply(this, arguments);
-        if (this.$textarea.attr('disabled') == 'disabled') {
-            this.$textarea.cleditor()[0].disable(true);
-        }
-        else {
-            this.$textarea.cleditor()[0].disable(false);
-        }
+        // propagate disabled property to cleditor
+        this.$cleditor.disable(this.$textarea.prop('disabled'));
     },
 
     set_value: function(value_) {
@@ -2339,8 +2335,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
     },
 
     get_value: function() {
-        var value = this.$cleditor.$area.val();
-        return value;
+        return this.$cleditor.$area.val();
     },
 });
 

From d5ec4a6535fa787e76e0653a0f779809193287d5 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 20 Jul 2012 17:14:02 +0530
Subject: [PATCH 374/397] [IMP] update pot files

bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
---
 addons/account/account.py                   |  4 ++--
 addons/account/i18n/account.pot             | 14 +++++++-------
 addons/mrp_repair/i18n/mrp_repair.pot       |  2 +-
 addons/point_of_sale/i18n/point_of_sale.pot |  2 +-
 addons/sale/i18n/sale.pot                   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c95dbe253ad..335822b7299 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."),
     }
 
     _defaults = {
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index b092b3a2f8c..174002a8d8d 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -203,7 +203,7 @@ msgstr ""
 #. module: account
 #: help:account.tax.code,notprintable:0
 #: help:account.tax.code.template,notprintable:0
-msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
+msgid "Check this box if you don't want any tax related to this tax code to appear on invoices"
 msgstr ""
 
 #. module: account
@@ -1853,7 +1853,7 @@ msgstr ""
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
-msgid "VAT Declaration"
+msgid "Tax Declaration"
 msgstr ""
 
 #. module: account
@@ -2249,7 +2249,7 @@ msgstr ""
 
 #. module: account
 #: view:account.vat.declaration:0
-msgid "This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
+msgid "This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
 msgstr ""
 
 #. module: account
@@ -4480,7 +4480,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
-msgid "Account Vat Declaration"
+msgid "Account Tax Declaration"
 msgstr ""
 
 #. module: account
@@ -4821,7 +4821,7 @@ msgstr ""
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
-msgid "Use this code for the VAT declaration."
+msgid "Use this code for the tax declaration."
 msgstr ""
 
 #. module: account
@@ -5247,7 +5247,7 @@ msgstr ""
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: account
@@ -7561,7 +7561,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
-msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
+msgid "This menu print a tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
 msgstr ""
 
 #. module: account
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 884f6a30d00..3f21da6f93d 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -154,7 +154,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index b0ff45bb671..0246ca65227 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -155,7 +155,7 @@ msgstr ""
 
 #. module: point_of_sale
 #: report:pos.lines:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 64cd1ee5a8c..2c477d1d7a0 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -105,7 +105,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: sale

From 284e7939360c9d6bde0e1f0394cc55648c0c11e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 13:50:46 +0200
Subject: [PATCH 375/397] [IMP] cleditor: removed source link. Updated
 get_value to be more consistent.

bzr revid: tde@openerp.com-20120720115046-fp0do72zy3cs2p2w
---
 addons/web/static/src/js/view_form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 29ba9060345..b65d95e9bd6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2310,8 +2310,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
             controls:   // controls to add to the toolbar
                         "bold italic underline strikethrough | size " +
                         "| removeformat | bullets numbering | outdent " +
-                        "indent | " +
-                        "link unlink | source",  
+                        "indent | link unlink",
             sizes:      // sizes in the font size popup
                         "1,2,3,4,5,6,7",
             bodyStyle:  // style to assign to document body contained within the editor
@@ -2335,7 +2334,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
     },
 
     get_value: function() {
-        return this.$cleditor.$area.val();
+        this.$cleditor.updateTextArea();
+        return this.$textarea.val();
     },
 });
 

From ae8b2f65ed50e33340453ffc624bacc4a9c72179 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 14:12:46 +0200
Subject: [PATCH 376/397] [FIX] merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix

bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13
---
 addons/base_calendar/__openerp__.py                  |  5 +++--
 addons/base_calendar/base_calendar_data.xml          |  2 +-
 addons/{crm => base_calendar}/crm_meeting_data.xml   |  0
 addons/{crm => base_calendar}/crm_meeting_demo.xml   | 12 ++++++------
 .../wizard/base_calendar_invite_attendee.py          |  3 +++
 addons/crm/__openerp__.py                            |  2 --
 addons/crm/test/process/lead2opportunity2win.yml     |  2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)
 rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%)
 rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca129f6f..c7df187dd87 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml'
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "demo_xml": [],
+    "demo_xml": ['crm_meeting_demo.xml'],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index 3c20bf5fad5..727a0703db2 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
     
-     <record model="res.request.link" id="request_link_meeting">
+     <record model="res.request.link" id="request_link_event">
             <field name="name">Event</field>
             <field name="object">calendar.event</field>
         </record>
diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
similarity index 100%
rename from addons/crm/crm_meeting_data.xml
rename to addons/base_calendar/crm_meeting_data.xml
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
similarity index 89%
rename from addons/crm/crm_meeting_demo.xml
rename to addons/base_calendar/crm_meeting_demo.xml
index dda6d5a03a8..ad88c11bb1b 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet1"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 676f9b3fdd2..0e62555f6ba 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -78,6 +78,9 @@ send an Email to Invited Person')
         att_obj = self.pool.get('calendar.attendee')
         user_obj = self.pool.get('res.users')
         current_user = user_obj.browse(cr, uid, uid, context=context)
+
+        import pdb
+        pdb.set_trace()
         for datas in self.read(cr, uid, ids, context=context):
             type = datas.get('type')
             vals = []
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..9fb1a4db28d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
-        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
-        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c1caf394c2e..1c2cfdeb605 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -113,7 +113,7 @@
 -
   !python {model: crm.meeting}: |
     context.update({'active_model': 'crm.meeting'}) 
-    self.case_open(cr, uid, [ref('crm.crm_case_reviewneeds0')])
+    self.case_open(cr, uid, [ref('base_calendar.crm_case_reviewneeds0')])
 -
   I invite a user for meeting.
 -

From 5759d97daa97ac07c76af1255b6b722f83c7ec49 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Jul 2012 14:35:28 +0200
Subject: [PATCH 377/397] [IMP] changed place of buttons in relation popups

bzr revid: nicolas.vanhoren@openerp.com-20120720123528-fpskc2r42d06z28r
---
 addons/web/static/src/js/view_form.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c430b013c40..13f70a421de 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3877,14 +3877,16 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
     display_popup: function() {
         var self = this;
         this.renderElement();
-        new instance.web.Dialog(this, {
+        var dialog = new instance.web.Dialog(this, {
             min_width: '800px',
-        dialogClass: 'oe_act_window',
+            dialogClass: 'oe_act_window',
             close: function() {
                 self.check_exit(true);
             },
             title: this.options.title || "",
+            buttons: [{text:"tmp"}],
         }, this.$element).open();
+        this.$buttonpane = dialog.$element.dialog("widget").find(".ui-dialog-buttonpane").html("");
         this.start();
     },
     on_write_completed: function() {},
@@ -3900,16 +3902,18 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
         if (this.row_id !== null) {
             options.initial_mode = this.options.readonly ? "view" : "edit";
         }
+        _.extend(options, {
+            $buttons: this.$buttonpane,
+        });
         this.view_form = new instance.web.FormView(this, this.dataset, false, options);
         if (this.options.alternative_form_view) {
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
         this.view_form.appendTo(this.$element.find(".oe_popup_form"));
         this.view_form.on_loaded.add_last(function() {
-            var $buttons = self.view_form.$element.find(".oe_form_buttons");
             var multi_select = self.row_id === null && ! self.options.disable_multiple_selection;
-            $buttons.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select}));
-            var $snbutton = $buttons.find(".oe_abstractformpopup-form-save-new");
+            self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select}));
+            var $snbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save-new");
             $snbutton.click(function() {
                 $.when(self.view_form.do_save()).then(function() {
                     self.view_form.reload_mutex.exec(function() {
@@ -3917,7 +3921,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
                     });
                 });
             });
-            var $sbutton = $buttons.find(".oe_abstractformpopup-form-save");
+            var $sbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save");
             $sbutton.click(function() {
                 $.when(self.view_form.do_save()).then(function() {
                     self.view_form.reload_mutex.exec(function() {
@@ -3925,7 +3929,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
                     });
                 });
             });
-            var $cbutton = $buttons.find(".oe_abstractformpopup-form-close");
+            var $cbutton = self.$buttonpane.find(".oe_abstractformpopup-form-close");
             $cbutton.click(function() {
                 self.check_exit();
             });
@@ -4034,6 +4038,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                         'selectable': !self.options.disable_multiple_selection,
                         'read_only': true,
                         'import_enabled': false,
+                        '$buttons': self.$buttonpane,
                     }, self.options.list_view_options || {}));
             self.view_list.popup = self;
             self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() {
@@ -4042,13 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 self.searchview.do_search();
             });
             self.view_list.on_loaded.add_last(function() {
-                var $buttons = self.view_list.$element.find(".oe-actions");
-                $buttons.prepend(QWeb.render("SelectCreatePopup.search.buttons"));
-                var $cbutton = $buttons.find(".oe_selectcreatepopup-search-close");
+                self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons"));
+                var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close");
                 $cbutton.click(function() {
                     self.destroy();
                 });
-                var $sbutton = $buttons.find(".oe_selectcreatepopup-search-select");
+                var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
                 if(self.options.disable_multiple_selection) {
                     $sbutton.hide();
                 }

From 52f6f0bd0437a0735cd3020a8786047c0fb00652 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Jul 2012 14:44:30 +0200
Subject: [PATCH 378/397] [IMP] Changed some "Cancel" buttons to links

bzr revid: nicolas.vanhoren@openerp.com-20120720124430-gbhow8qcipsrieb4
---
 addons/web/static/src/js/view_form.js | 5 +----
 addons/web/static/src/xml/base.xml    | 9 ++++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 13f70a421de..06ca0ce13c4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4047,15 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 self.searchview.do_search();
             });
             self.view_list.on_loaded.add_last(function() {
-                self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons"));
+                self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self}));
                 var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close");
                 $cbutton.click(function() {
                     self.destroy();
                 });
                 var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select");
-                if(self.options.disable_multiple_selection) {
-                    $sbutton.hide();
-                }
                 $sbutton.click(function() {
                     self.on_select_elements(self.selected_ids);
                     self.destroy();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5377c394ace..f334b649671 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1468,8 +1468,11 @@
     </div>
 </t>
 <t t-name="SelectCreatePopup.search.buttons">
-    <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
-    <button type="button" class="oe_button oe_selectcreatepopup-search-close">Cancel</button>
+    <t t-if="! widget.options.disable_multiple_selection">
+        <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
+        or
+    </t>
+    <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
 </t>
 <t t-name="AbstractFormPopup.buttons">
     <t t-if="! multi_select">
@@ -1479,7 +1482,7 @@
         <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
         <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
     </t>
-    <button type="button" class="oe_button oe_abstractformpopup-form-close">Cancel</button>
+    or <a class="oe_button oe_abstractformpopup-form-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
 </t>
 <t t-extend="ListView.row">
     <!-- adds back padding to row being rendered after edition, if necessary

From 3c7c73dfca05100d6e8a783b285693618d8fb64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 14:56:23 +0200
Subject: [PATCH 379/397] [CLEAN] Removed some commented lines.

bzr revid: tde@openerp.com-20120720125623-rvoyta3kmbkkiwyy
---
 addons/mail/wizard/mail_compose_message_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 816cfddb555..8fa4eaa9c50 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -45,8 +45,6 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
-<!--                         <field name="type" invisible="1"/>
-                        <field name="content_subtype" invisible="1"/> -->
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
@@ -62,7 +60,7 @@
                             or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
                         </div>
                         <div class='oe_mail_compose_message_icons'>
-                            <!-- <button icon="../../../../../mail/static/src/img/checklist"
+<!--                             <button icon="../../../../../mail/static/src/img/checklist"
                                 type="object" name="checklist" string=""
                                 help="Add a checklist"/> -->
                             <a href="#" class="oe_mail_compose_message_checklist">

From 707c2dd573a8505a1d1af9b31b6f8666929e3bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 14:57:09 +0200
Subject: [PATCH 380/397] [FIX] mail.compos.message: outgoing state only for
 emails. Send only emails, also.

bzr revid: tde@openerp.com-20120720125709-rgfiwsy8qp3z5x1f
---
 addons/mail/wizard/mail_compose_message.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index de3e5ca39ba..d26511464f8 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -136,6 +136,8 @@ class mail_compose_message(osv.TransientModel):
             'email_from': user.user_email or tools.config.get('email_from', False),
             'body_html': False,
             'body_text': False,
+            'subject': False,
+            'dest_partner_ids': [],
         })
         return result
 
@@ -263,6 +265,7 @@ class mail_compose_message(osv.TransientModel):
             subject = mail_wiz.subject if formatting else False
             content_subtype = 'html' if formatting else 'plain'
             type = 'email' if email_mode else 'comment'
+            state = 'outgoing' if email_mode else False
             partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
             references = None
             headers = {}
@@ -298,7 +301,7 @@ class mail_compose_message(osv.TransientModel):
                     # processed as soon as the mail scheduler runs.
                     if mail_thread_enabled:
                         active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
-                            type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids,
+                            type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
                             email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc,
                             reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
                     else:
@@ -310,16 +313,17 @@ class mail_compose_message(osv.TransientModel):
                 # normal mode - no mass-mailing
                 if mail_thread_enabled:
                     msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
-                        type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids,
+                        type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
                         email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
                         reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
                 else:
                     msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
-                        model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
+                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
                         attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
                         content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                mail_message_obj.send(cr, uid, msg_ids, context=context)
+                if type == 'email':
+                    mail_message_obj.send(cr, uid, msg_ids, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 

From f6a4e4875d31d936fb15194e18b0efdd2a48b5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 14:57:29 +0200
Subject: [PATCH 381/397] [IMP] mail.message: added type in parameters. Default
 is email.

bzr revid: tde@openerp.com-20120720125729-4xq31w4o0qey6erl
---
 addons/mail/mail_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2443a5b8eca..b96b6e3791e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -295,7 +295,7 @@ class mail_message(osv.Model):
         self.check(cr, uid, ids, 'unlink', context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context)
 
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False,
+    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
                              email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
                              message_id=False, references=False, res_id=False, content_subtype='plain',
                              headers=None, mail_server_id=False, auto_delete=False, context=None):
@@ -352,6 +352,7 @@ class mail_message(osv.Model):
                 'user_id': uid,
                 'model': model,
                 'res_id': res_id,
+                'type': type,
                 'body_text': body if content_subtype != 'html' else False,
                 'body_html': body if content_subtype == 'html' else False,
                 'email_from': email_from,

From c9ff048d924f18e49e0b65cd4159305d1fe4d5a5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Jul 2012 15:01:00 +0200
Subject: [PATCH 382/397] [IMP] debug mode

bzr revid: nicolas.vanhoren@openerp.com-20120720130100-olttd8ovamdtywtt
---
 addons/web/common/http.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 87748d2e6d9..bb87d719bad 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -28,6 +28,7 @@ import werkzeug.wsgi
 from . import nonliterals
 from . import session
 from . import openerplib
+import urlparse
 
 __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
            'WebRequest', 'JsonRequest', 'HttpRequest']
@@ -422,7 +423,9 @@ class DisableCacheMiddleware(object):
         self.app = app
     def __call__(self, environ, start_response):
         def start_wrapped(status, headers):
-            debug = environ.get('HTTP_REFERER', '').find('debug') != -1
+            referer = environ.get('HTTP_REFERER', '')
+            parsed = urlparse.urlparse(referer)
+            debug = not urlparse.parse_qs(parsed.query).has_key('debug')
             filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] 
             if debug:
                 filtered_headers.append(('Cache-Control', 'no-cache'))

From a8ca054cf203ea01656590ee44af8ac2b44fd200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:01:27 +0200
Subject: [PATCH 383/397] [CLEAN] mail.js: removed debug data.

bzr revid: tde@openerp.com-20120720130127-7kquweauwh4bv7zi
---
 addons/mail/static/src/css/mail.css |  8 --------
 addons/mail/static/src/js/mail.js   | 12 +-----------
 addons/mail/static/src/xml/mail.xml | 18 +-----------------
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index cf2f7d43a20..03f1078e6d5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -275,14 +275,6 @@
     display: none;
 }
 
-.openerp ul.oe_mail_debug {
-    color: #888;
-}
-
-.openerp ul.oe_mail_debug li {
-    margin-right: 12px;
-}
-
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3872a486565..8ce050fd144 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -319,11 +319,11 @@ openerp.mail = function(session) {
         reinit: function() {
             var self = this;
             if (! this.form_view) return;
-            // debugger
             var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
                 function (result) {
                     self.form_view.on_processed_onchange({'value': result}, []);
                 });
+            return call_defer;
         },
 
         /**
@@ -586,12 +586,8 @@ openerp.mail = function(session) {
 
         do_customize_display: function() {
             if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
-            if (this.session.debug) {
-                this.$element.find('ul.oe_mail_debug').toggleClass('oe_mail_invisible');
-            }
         },
 
-
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
@@ -656,12 +652,6 @@ openerp.mail = function(session) {
                 self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
                 event.preventDefault();
             });
-            // event: click on "Debug data" in msg side menu (email style)
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_debug', 'click', function (event) {
-                var act_dom = $(event.srcElement).parents('div.oe_mail_msg_content').find('ul.oe_mail_debug');
-                act_dom.toggleClass('oe_mail_invisible');
-                event.preventDefault();
-            });
         },
         
         destroy: function () {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5d76096fb9a..bf8d7fd1475 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -136,7 +136,6 @@
                         </li> -->
                         <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
-                        <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -147,27 +146,12 @@
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
                         <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
-                    <ul class="oe_mail_invisible oe_mail_debug">
-                        <li>document: (<t t-raw="record.model"/>,<t t-raw="record.res_id"/>)</li>
-                        <li>id: <t t-raw="record.id"/></li>
-                        <li>type: <t t-raw="record.type"/></li>
-                        <li>content_subtype: <t t-raw="record.content_subtype"/></li>
-                        <li>state: <t t-raw="record.state"/></li>
-                        <li>parent_id: <t t-raw="record.parent_id"/></li>
-                        <li>email_from: <t t-raw="record.email_from"/></li>
-                        <li>email_to: <t t-raw="record.email_to"/></li>
-                        <li>email_cc: <t t-raw="record.email_cc"/></li>
-                        <li>email_bcc: <t t-raw="record.email_bcc"/></li>
-                        <li>reply_to: <t t-raw="record.reply_to"/></li>
-                        <li>partner_ids: <t t-raw="record.partner_ids"/></li>
-                        <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
-                        <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
-                    </ul>
                     <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
                         <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
                         <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
                     </div>
+                    <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>

From e9ec0ec009a1ad69f210f2117e5023d0e972e55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:28:46 +0200
Subject: [PATCH 384/397] [REM] mail_thread: removed broadcast.

bzr revid: tde@openerp.com-20120720132846-s1ad623e60pyejeb
---
 addons/mail/mail_thread.py | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 1f1a3d7223b..d036150b21c 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -811,31 +811,6 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
     # Note specific
     #------------------------------------------------------
-    
-    def message_broadcast(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None):
-        if context is None:
-            context = {}
-        notification_obj = self.pool.get('mail.notification')
-        # write message
-        msg_ids = self.message_append_note(cr, uid, ids, subject=subject, body=body, parent_id=parent_id, type=type, content_subtype=content_subtype, context=context)
-        # escape if in install mode or note writing was not successfull
-        if 'install_mode' in context:
-            return True
-        if not isinstance(msg_ids, (list)):
-            return True
-        # get already existing notigications
-        notification_ids = notification_obj.search(cr, uid, [('message_id', 'in', msg_ids)], context=context)
-        already_pushed_user_ids = map(itemgetter('user_id'), notification_obj.read(cr, uid, notification_ids, context=context))
-        # get base.group_user group
-        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user') or False
-        group_id = res and res[1] or False
-        if not group_id: return True
-        group = self.pool.get('res.groups').browse(cr, uid, [group_id], context=context)[0]
-        for user in group.users:
-            if user.id in already_pushed_user_ids: continue
-            for msg_id in msg_ids:
-                notification_obj.create(cr, uid, {'user_id': user.id, 'message_id': msg_id}, context=context)
-        return True
 
     def log(self, cr, uid, id, message, secondary=False, context=None):
         _logger.warning("log() is deprecated. As this module inherit from \

From 34db4d2ac7cea573afc8beb7f1e3915529962c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:29:04 +0200
Subject: [PATCH 385/397] [IMP] res_users in mail: Welcome message posted on
 its wall at creation.

bzr revid: tde@openerp.com-20120720132904-v7f8876p87c74wxe
---
 addons/mail/res_users.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 203854925d7..89767473754 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -24,8 +24,9 @@ from tools.translate import _
 
 class res_users(osv.osv):
     """ Update of res.users class
-        - add a preference about sending emails about notificatoins
+        - add a preference about sending emails about notifications
         - make a new user follow itself
+        - add a welcome message
     """
     _name = 'res.users'
     _inherit = ['res.users', 'mail.thread']
@@ -61,11 +62,10 @@ class res_users(osv.osv):
         user = self.browse(cr, uid, [user_id], context=context)[0]
         # make user follow itself
         self.message_subscribe(cr, uid, [user_id], [user_id], context=context)
-        # create a welcome message to broadcast
+        # create a welcome message
         company_name = user.company_id.name if user.company_id else 'the company'
-        message = _('%s has joined %s! You may leave him/her a message to celebrate a new arrival in the company ! You can help him/her doing its first steps on OpenERP.') % (user.name, company_name)
-        # TODO: clean the broadcast feature. As this is not cleany specified, temporarily remove the message broadcasting that is not buggy but not very nice.
-        #self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context)
+        message = _('%s has joined %s! Welcome in OpenERP !') % (user.name, company_name)
+        self.message_append_note(cr, uid, [user_id], subject='Welcom to OpenERP', body=message, type='comment', context=context)
         return user_id
 
     def message_search_get_domain(self, cr, uid, ids, context=None):

From 76678c427eecb70d32652de38a35ce1efda96c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:29:31 +0200
Subject: [PATCH 386/397] [IMP] res_partner in mail: also look messages related
 to the partner.

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

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index aeec9a5a6b3..3dc1f91d857 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -33,7 +33,7 @@ class res_partner_mail(osv.osv):
         """
         initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
         if self._name == 'res.partner': # to avoid models inheriting from res.partner
-            search_domain = ['|'] + initial_domain + [('partner_ids', 'in', ids)]
+            search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)]
         return search_domain
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 2578f575e220557ebd4f9ade1e4b5684f3bba1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:29:52 +0200
Subject: [PATCH 387/397] [IMP] hr_employee: now sends a message on All
 employee mail.group to welcome the new employee.

bzr revid: tde@openerp.com-20120720132952-y0j1d4n7qaywbrrl
---
 addons/hr/hr.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 4a0c3736222..2a0ea3b45a4 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -212,6 +212,16 @@ class hr_employee(osv.osv):
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
+    def create(self, cr, uid, data, context=None):
+        employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
+        try:
+            (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
+            employee = self.browse(cr, uid, employee_id, context=context)
+            self.pool.get('mail.group').message_append_note(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
+        except:
+            pass # group deleted: do not push a message
+        return employee_id
+
     def unlink(self, cr, uid, ids, context=None):
         resource_obj = self.pool.get('resource.resource')
         resource_ids = []

From b30754f32bab0376c9f734c66675fed342564d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:37:12 +0200
Subject: [PATCH 388/397] [IMP] demo data: made them noupdate.

bzr revid: tde@openerp.com-20120720133712-p6gd58nndabsit14
---
 addons/mail/data/mail_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 0a4751cedb1..274259e544e 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="message_blogpost0_attachment0" model="ir.attachment">
             <field name="name">A cool attachment</field>

From 365cb6284571f04f08a9ffc4e4bab60fc57153a3 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 15:46:54 +0200
Subject: [PATCH 389/397] [FIX] base_calendar: remove pdb

bzr revid: stw@openerp.com-20120720134654-2mzht44jvteayuen
---
 addons/base_calendar/wizard/base_calendar_invite_attendee.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 0e62555f6ba..5da711cf657 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -79,8 +79,6 @@ send an Email to Invited Person')
         user_obj = self.pool.get('res.users')
         current_user = user_obj.browse(cr, uid, uid, context=context)
 
-        import pdb
-        pdb.set_trace()
         for datas in self.read(cr, uid, ids, context=context):
             type = datas.get('type')
             vals = []

From ec3ff22aed6c113a1fad2875809562e9f9a92a13 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Jul 2012 16:13:04 +0200
Subject: [PATCH 390/397] [FIX] rare problem during save

bzr revid: nicolas.vanhoren@openerp.com-20120720141304-dpmw02lx7u2ureia
---
 addons/web/static/src/js/view_form.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 06ca0ce13c4..d97197074bb 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -80,7 +80,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this.reload_mutex = new $.Mutex();
         this.__clicked_inside = false;
         this.__blur_timeout = null;
-        this.rendering_engine = new instance.web.form.FormRenderingEngineReadonly(this);
+        this.rendering_engine = new instance.web.form.FormRenderingEngine(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
     destroy: function() {
@@ -680,7 +680,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     if (!first_invalid_field) {
                         first_invalid_field = f;
                     }
-                } else if (f.name !== 'id' && !f.get("readonly") && (!self.datarecord.id || f._dirty_flag)) {
+                } else if (f.name !== 'id' && (!self.datarecord.id || (!f.get("readonly") && f._dirty_flag))) {
                     // Special case 'id' field, do not save this field
                     // on 'create' : save all non readonly fields
                     // on 'edit' : save non readonly modified fields
@@ -1347,12 +1347,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
     },
 });
 
-instance.web.form.FormRenderingEngineReadonly = instance.web.form.FormRenderingEngine.extend({
-    alter_field: function(field) {
-        field.set({"force_readonly": true});
-    },
-});
-
 instance.web.form.FormDialog = instance.web.Dialog.extend({
     init: function(parent, options, view_id, dataset) {
         this._super(parent, options);
@@ -1813,6 +1807,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
         // "force_readonly"
         this.set({"readonly": this.modifiers['readonly'] === true});
+        this.set({"force_readonly": false});
         var test_effective_readonly = function() {
             this.set({"effective_readonly": this.get("readonly") || !!this.get("force_readonly")});
         };

From 1b5b5d9a87c433583be09f8cb65cab97a7f672bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 16:17:54 +0200
Subject: [PATCH 391/397] [CLEAN] email_template: removed print statements.

bzr revid: tde@openerp.com-20120720141754-dlbl78znso8dzyz2
---
 addons/email_template/wizard/mail_compose_message.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 410817dc06e..1b007a990c0 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -103,14 +103,9 @@ class mail_compose_message(osv.osv_memory):
         for record in self.browse(cr, uid, ids, context=context):
             values = {}
             use_template = record.use_template
-            print 'template_toggle: use_template: %d' % (use_template)
-            # update use_template value
-
             # simulate an on_change on use_template
             values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value'])
-            print 'template_toggle: values %s' % (str(values))
             record.write(values)
-            
             return False
 
     def onchange_use_template(self, cr, uid, ids, use_template, context=None):
@@ -121,7 +116,6 @@ class mail_compose_message(osv.osv_memory):
                 onchange_template_values = self.on_change_template(cr, uid, record.id, use_template,
                     False, email_from=record.email_from, email_to=record.email_to, context=context)
                 values.update(onchange_template_values['value'])
-            print 'onchange_use_template: values %s' % (str(values))
         return {'value': values}
 
     def save_as_template(self, cr, uid, ids, context=None):

From 062017bd87c6acb011a4e3b5386de1b2f620085a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 20 Jul 2012 16:18:30 +0200
Subject: [PATCH 392/397] [IMP] usability: partner form view

bzr revid: qdp-launchpad@openerp.com-20120720141830-htjstvlkqikv4d0z
---
 addons/account/partner_view.xml             | 24 ++++++---------------
 addons/base_vat/base_vat_view.xml           |  2 +-
 addons/l10n_be_invoice_bba/partner_view.xml |  2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index cd75daa6c07..1e360f6c742 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -78,18 +78,19 @@
                 <page string="Accounting" col="4">
                     <group>
                         <group>
-                            <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="last_reconciliation_date"/>
+                        </group>
+                        <group>
+                            <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_payment_term" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="property_account_payable" groups="account.group_account_invoice"/>
-                        </group>
-                        <group>
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
                         <group>
+                            <field name="property_account_payable" groups="account.group_account_invoice"/>
                             <field name="debit"/>
                         </group>
                     </group>
@@ -142,16 +143,5 @@
             view_type="form"
             view_mode="tree,form,graph,calendar"/>
 
-        <record id="view_res_partner_reconcile" model="ir.ui.view">
-            <field name="name">res.partner.form.reconcile</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <field name="credit_limit" position="after">
-                    <field name="last_reconciliation_date"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 1d7f06eb571..df1d18ac194 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -7,7 +7,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
-                <field name="property_account_payable" position="after" version="7.0">
+                <field name="property_account_position" position="after" version="7.0">
                     <label for="vat"/>
                     <div>
                         <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_inline"/>
diff --git a/addons/l10n_be_invoice_bba/partner_view.xml b/addons/l10n_be_invoice_bba/partner_view.xml
index 8be0f31d612..d78df2d7a42 100644
--- a/addons/l10n_be_invoice_bba/partner_view.xml
+++ b/addons/l10n_be_invoice_bba/partner_view.xml
@@ -9,7 +9,7 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
-        <field name="property_payment_term" position="after">
+        <field name="last_reconciliation_date" position="after">
           <field name="out_inv_comm_type"/>
           <field name="out_inv_comm_algorithm" attrs="{'invisible':[('out_inv_comm_type','!=','bba')]}"/>
         </field>

From c73e736db008bbb59aaaf3abdcd092686a6cd69c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Jul 2012 16:20:23 +0200
Subject: [PATCH 393/397] [FIX] small problem with m2o

bzr revid: nicolas.vanhoren@openerp.com-20120720142023-8a1m5b30yvoywnbs
---
 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 d97197074bb..4e2f3889dd0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2762,7 +2762,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                     });
                     return false;
                  });
-            $(".oe_form_m2o_follow").html(follow);
+            $(".oe_form_m2o_follow", this.$element).html(follow);
         }
     },
     set_value: function(value_) {

From c5433fc14f9eb8211e81aff2bcc931a0f50865c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 17:25:54 +0200
Subject: [PATCH 394/397] [REVIEW] IMproved regex.

bzr revid: tde@openerp.com-20120720152554-j6x7ilroxhivggj3
---
 openerp/addons/base/res/res_partner.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f3985c79552..df58c651186 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -313,12 +313,12 @@ class res_partner(osv.osv):
               Raoul Grosbedon, and set its email to raoul@grosbedon.fr
             - anything else: fall back on the default name_create
             Regex :
-            - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}): raoul@grosbedon.fr
-            - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]:
+            - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8}): raoul@grosbedon.fr
+            - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]:
               Raoul Grosbedon, raoul@grosbedon.fr
         """
-        contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]')
-        email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})')
+        contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})[\>]')
+        email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9._]{1,8})')
         contact_regex_res = contact_regex.findall(name)
         email_regex_res = email_regex.findall(name)
         if contact_regex_res:

From bfb890dbca42d753b197708cf4b3d57d18331c81 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 20 Jul 2012 17:34:25 +0200
Subject: [PATCH 395/397] [FIX] 'Sales' top menu items sequence

bzr revid: abo@openerp.com-20120720153425-56h62eyju9g5fo3n
---
 openerp/addons/base/res/res_partner_view.xml | 39 +++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index bfe0533e6cb..3cced9eb64a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman"/>
+
+        <!-- Top menu item -->
+        <menuitem name="Sales"
+            id="menu_base_partner"
+            groups="base.group_sale_salesman"
+            sequence="30"/>
+
             <menuitem id="base.menu_sales" parent="base.menu_base_partner" name="Sales" sequence="1" />
             <menuitem id="menu_base_config" parent="menu_base_partner" name="Configuration" sequence="30" groups="group_system"/>
                 <menuitem id="menu_config_address_book" parent="menu_base_config" name="Address Book" sequence="40" groups="group_system"/>
 
-        <!--
-          =======================
-          Partner Titles
-          =======================
-        -->
+        <!-- Partner Titles -->
         <record id="view_partner_title_tree" model="ir.ui.view">
             <field name="name">res.partner.title.tree</field>
             <field name="model">res.partner.title</field>
@@ -70,11 +72,8 @@
         </record>
 
         <menuitem action="action_partner_title_contact" id="menu_partner_title_contact" name="Contact Titles" parent="menu_config_address_book" sequence="3" groups="base.group_no_one"/>
-        <!--
-          =======================
-          Partner
-          =======================
-        -->
+
+        <!-- Partner -->
         <record id="view_partner_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
             <field name="model">res.partner</field>
@@ -104,7 +103,7 @@
                     <field name="photo" widget='image' class="oe_avatar oe_left"/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name" string="Customer Name"/> 
+                            <label for="name" string="Customer Name"/>
                             (<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
                         </div>
                         <h1>
@@ -119,7 +118,7 @@
                             <field name="parent_id"
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                 attrs="{'invisible': [('is_company','=', True)]}"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
+                                on_change="onchange_address(use_parent_address, parent_id)"/>,
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
                             <div attrs="{'invisible': [('parent_id','=', False)]}">
                                 <field class="oe_inline"
@@ -196,7 +195,7 @@
                                                                         <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
                                                                             <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
                                                                         </a>
-                                                                        
+
                                                                     </td>
                                                                 </tr>
                                                             </table>
@@ -248,7 +247,7 @@
             <field name="arch" type="xml">
                 <search string="Search Partner">
                    <group col='10' colspan='4'>
-                        <field name="name" 
+                        <field name="name"
                             filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
                             string="Partner"/>
                         <separator orientation="vertical"/>
@@ -256,7 +255,7 @@
                         <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
                         <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
                         <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>                        
+                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
                         <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="user_id"/>
@@ -434,11 +433,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_payterm_form"/>
         </record>
-        <!--
-          ======================
-          Categories
-          ======================
-        -->
+
+        <!-- Categories -->
         <record id="view_partner_category_form" model="ir.ui.view">
             <field name="name">Partner Categories</field>
             <field name="model">res.partner.category</field>
@@ -517,4 +513,3 @@
 
     </data>
 </openerp>
-

From 69806324a606c8c2f1d524690981729f58bfdfd6 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 20 Jul 2012 17:35:20 +0200
Subject: [PATCH 396/397] [FIX] 'Sales' top menu items sequence

bzr revid: abo@openerp.com-20120720153520-gahyk0uj6il3ia0h
---
 addons/crm/crm_view.xml   | 10 ++++++++--
 addons/sale/sale_view.xml |  7 +++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fc3cb3a3d2e..3f6e97fa186 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,10 +2,16 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1"
+        <!-- Top menu item -->
+        <!--
+            This menu item's purpose is to overwrite another one defined in
+            the base module in order to set new groups.
+        -->
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
             groups="base.group_sale_manager,base.group_sale_salesman"/>
 
-        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities" 
+        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="80" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 03a2f35cbbe..3f7f7efa43b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -3,10 +3,13 @@
     <data>
 
         <!-- Top menu item -->
+        <!--
+            This menu item's purpose is to overwrite another one defined in
+            the base module in order to set new groups.
+        -->
         <menuitem name="Sales"
             id="base.menu_base_partner"
-            groups="base.group_sale_salesman,base.group_sale_manager"
-            sequence="30"/>
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 

From 31acc737fa8341b43f900ae0f69d93b3357f8616 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 21 Jul 2012 05:08:32 +0000
Subject: [PATCH 397/397] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120721050832-zkzeqskzl40kn2b8
---
 addons/crm_helpdesk/i18n/lv.po     | 738 +++++++++++++++++++++++++++++
 addons/mrp_repair/i18n/ar.po       |  11 +-
 addons/mrp_repair/i18n/bg.po       |  11 +-
 addons/mrp_repair/i18n/bs.po       |   6 +-
 addons/mrp_repair/i18n/ca.po       |  11 +-
 addons/mrp_repair/i18n/cs.po       |   6 +-
 addons/mrp_repair/i18n/da.po       |   6 +-
 addons/mrp_repair/i18n/de.po       |  11 +-
 addons/mrp_repair/i18n/es.po       |  11 +-
 addons/mrp_repair/i18n/es_AR.po    |  11 +-
 addons/mrp_repair/i18n/es_CR.po    |  11 +-
 addons/mrp_repair/i18n/es_EC.po    |  11 +-
 addons/mrp_repair/i18n/et.po       |  11 +-
 addons/mrp_repair/i18n/fi.po       |  11 +-
 addons/mrp_repair/i18n/fr.po       |  11 +-
 addons/mrp_repair/i18n/hi.po       |  11 +-
 addons/mrp_repair/i18n/hr.po       |  11 +-
 addons/mrp_repair/i18n/hu.po       |  11 +-
 addons/mrp_repair/i18n/id.po       |   6 +-
 addons/mrp_repair/i18n/it.po       |  11 +-
 addons/mrp_repair/i18n/ja.po       |  11 +-
 addons/mrp_repair/i18n/ko.po       |   6 +-
 addons/mrp_repair/i18n/lt.po       |   6 +-
 addons/mrp_repair/i18n/nl.po       |  13 +-
 addons/mrp_repair/i18n/nl_BE.po    |   6 +-
 addons/mrp_repair/i18n/pl.po       |  11 +-
 addons/mrp_repair/i18n/pt.po       |  11 +-
 addons/mrp_repair/i18n/pt_BR.po    |   6 +-
 addons/mrp_repair/i18n/ro.po       |  11 +-
 addons/mrp_repair/i18n/ru.po       |   6 +-
 addons/mrp_repair/i18n/sl.po       |  11 +-
 addons/mrp_repair/i18n/sq.po       |   6 +-
 addons/mrp_repair/i18n/sr.po       |  11 +-
 addons/mrp_repair/i18n/sr@latin.po |  11 +-
 addons/mrp_repair/i18n/sv.po       |  11 +-
 addons/mrp_repair/i18n/tlh.po      |   6 +-
 addons/mrp_repair/i18n/tr.po       |  11 +-
 addons/mrp_repair/i18n/uk.po       |   6 +-
 addons/mrp_repair/i18n/vi.po       |   6 +-
 addons/mrp_repair/i18n/zh_CN.po    |  11 +-
 addons/mrp_repair/i18n/zh_TW.po    |   6 +-
 addons/sale/i18n/ar.po             |  11 +-
 addons/sale/i18n/bg.po             |  11 +-
 addons/sale/i18n/bs.po             |  11 +-
 addons/sale/i18n/ca.po             |  11 +-
 addons/sale/i18n/cs.po             |  11 +-
 addons/sale/i18n/da.po             |  11 +-
 addons/sale/i18n/de.po             |  11 +-
 addons/sale/i18n/el.po             |  11 +-
 addons/sale/i18n/es.po             |  11 +-
 addons/sale/i18n/es_AR.po          |  11 +-
 addons/sale/i18n/es_CL.po          |  11 +-
 addons/sale/i18n/es_CR.po          |  11 +-
 addons/sale/i18n/es_EC.po          |  11 +-
 addons/sale/i18n/et.po             |  11 +-
 addons/sale/i18n/fi.po             |  11 +-
 addons/sale/i18n/fr.po             |  11 +-
 addons/sale/i18n/gl.po             |   6 +-
 addons/sale/i18n/hr.po             |  11 +-
 addons/sale/i18n/hu.po             |  11 +-
 addons/sale/i18n/id.po             |  11 +-
 addons/sale/i18n/is.po             |  11 +-
 addons/sale/i18n/it.po             |  11 +-
 addons/sale/i18n/ja.po             |  11 +-
 addons/sale/i18n/ko.po             |  11 +-
 addons/sale/i18n/lt.po             |  11 +-
 addons/sale/i18n/lv.po             |  11 +-
 addons/sale/i18n/mn.po             |  11 +-
 addons/sale/i18n/nb.po             |  11 +-
 addons/sale/i18n/nl.po             |  17 +-
 addons/sale/i18n/nl_BE.po          |  11 +-
 addons/sale/i18n/oc.po             |   6 +-
 addons/sale/i18n/pl.po             |  11 +-
 addons/sale/i18n/pt.po             |  11 +-
 addons/sale/i18n/pt_BR.po          |  11 +-
 addons/sale/i18n/ro.po             |  11 +-
 addons/sale/i18n/ru.po             |  11 +-
 addons/sale/i18n/sk.po             |  11 +-
 addons/sale/i18n/sl.po             |  11 +-
 addons/sale/i18n/sq.po             |   6 +-
 addons/sale/i18n/sr.po             |  11 +-
 addons/sale/i18n/sr@latin.po       |  11 +-
 addons/sale/i18n/sv.po             |  11 +-
 addons/sale/i18n/th.po             |  11 +-
 addons/sale/i18n/tlh.po            |   6 +-
 addons/sale/i18n/tr.po             |  11 +-
 addons/sale/i18n/uk.po             |  11 +-
 addons/sale/i18n/vi.po             |  11 +-
 addons/sale/i18n/zh_CN.po          |  11 +-
 addons/sale/i18n/zh_TW.po          |  11 +-
 90 files changed, 1293 insertions(+), 342 deletions(-)
 create mode 100644 addons/crm_helpdesk/i18n/lv.po

diff --git a/addons/crm_helpdesk/i18n/lv.po b/addons/crm_helpdesk/i18n/lv.po
new file mode 100644
index 00000000000..1b9d1a4e917
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/lv.po
@@ -0,0 +1,738 @@
+# Latvian 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-07-20 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index 35ac83fec75..ddc13ca9742 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/i18n/ar.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -184,8 +184,8 @@ msgstr "تحذير !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "ضريبة القيمة المضافة"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -803,6 +803,9 @@ msgstr "جاهز للتصليح"
 msgid "No partner !"
 msgstr "لا يوجد شريك !"
 
+#~ msgid "VAT"
+#~ msgstr "ضريبة القيمة المضافة"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
 
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 08191fcf27d..75c633410ca 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/i18n/bg.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr "Предупреждение!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "ДДС"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -785,5 +785,8 @@ msgstr "Няма контрагент!"
 #~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 #~ "символи!"
 
+#~ msgid "VAT"
+#~ msgstr "ДДС"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Искате ли да създадете фактурата/ите"
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index 526d3c41d1c..413d19342b0 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/i18n/bs.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index f298ca712d8..7d0c984c5ac 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -193,8 +193,8 @@ msgstr "Avís!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "CIF/NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -842,6 +842,9 @@ msgstr "No existeix empresa!"
 #~ msgid "Repair Order Ref"
 #~ msgstr "Referència comanda reparació"
 
+#~ msgid "VAT"
+#~ msgstr "CIF/NIF"
+
 #~ msgid "Repairs in quotation"
 #~ msgstr "Reparacions en pressupost"
 
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index 0c8bd6f3af8..ddfe269417d 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/i18n/cs.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/da.po b/addons/mrp_repair/i18n/da.po
index 2f74c448a7a..fc36b6c5917 100644
--- a/addons/mrp_repair/i18n/da.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,7 +170,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index c559b16d6f5..36647265cf2 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -191,8 +191,8 @@ msgstr "Warnung !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "USt."
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -926,6 +926,9 @@ msgstr "Kein Partner"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Wollen Sie wirklich die Rechnung(en) erstellen ?"
 
+#~ msgid "VAT"
+#~ msgstr "USt."
+
 #~ msgid ""
 #~ "\n"
 #~ "           The aim is to have a complete module to manage all products "
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index f0b5d2205cb..d44970c0c80 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -191,8 +191,8 @@ msgstr "¡Aviso!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "CIF/NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -870,6 +870,9 @@ msgstr "¡No existe empresa!"
 #~ msgid "Make invoices"
 #~ msgstr "Realizar facturas"
 
+#~ msgid "VAT"
+#~ msgstr "CIF/NIF"
+
 #, python-format
 #~ msgid "You have to select a partner in the repair form !"
 #~ msgstr "¡Debe seleccionar una empresa en el formulario de reparación!"
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 40858dd108c..368ffcbd7d5 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/i18n/es_AR.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "CUIT"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -865,6 +865,9 @@ msgstr "Sin Partner !"
 #~ msgid "Repair State"
 #~ msgstr "Reparar Estado"
 
+#~ msgid "VAT"
+#~ msgstr "CUIT"
+
 #~ msgid "Repair Ref"
 #~ msgstr "Ref de Reparación"
 
diff --git a/addons/mrp_repair/i18n/es_CR.po b/addons/mrp_repair/i18n/es_CR.po
index e5cd95f091f..09f38dcda23 100644
--- a/addons/mrp_repair/i18n/es_CR.po
+++ b/addons/mrp_repair/i18n/es_CR.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 "Language: \n"
 
 #. module: mrp_repair
@@ -192,8 +192,8 @@ msgstr "¡Aviso!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "CIF/NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -823,6 +823,9 @@ msgstr "Listo para reparar"
 msgid "No partner !"
 msgstr "¡No existe empresa!"
 
+#~ msgid "VAT"
+#~ msgstr "CIF/NIF"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Desea crear la(s) factura(s)?"
 
diff --git a/addons/mrp_repair/i18n/es_EC.po b/addons/mrp_repair/i18n/es_EC.po
index 3c9cf62af31..ded01d3dcfc 100644
--- a/addons/mrp_repair/i18n/es_EC.po
+++ b/addons/mrp_repair/i18n/es_EC.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "CIF/NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -790,6 +790,9 @@ msgstr ""
 #~ msgid "Repair State"
 #~ msgstr "Estado de reparación"
 
+#~ msgid "VAT"
+#~ msgstr "CIF/NIF"
+
 #~ msgid "Repairs in quotation"
 #~ msgstr "Reparaciones en presupuesto"
 
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index ec12e85f5bd..4917c9c1a57 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/i18n/et.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -174,8 +174,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "KM"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -883,3 +883,6 @@ msgstr "Partner puudub!"
 
 #~ msgid "Repairs to be invoiced"
 #~ msgstr "Remondid arveldamiseks"
+
+#~ msgid "VAT"
+#~ msgstr "KM"
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index ad73e5efe54..17352e0098b 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -174,8 +174,8 @@ msgstr "Varoitus !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "ALV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -877,6 +877,9 @@ msgstr "Ei kumppania!"
 #~ msgid "Quality"
 #~ msgstr "Laatu"
 
+#~ msgid "VAT"
+#~ msgstr "ALV"
+
 #~ msgid "Make invoices"
 #~ msgstr "Luo laskut"
 
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 37f960e2e4e..f6b929a2c88 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -191,8 +191,8 @@ msgstr "Avertissement !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "TVA"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -821,6 +821,9 @@ msgstr "Prêt à Réparer"
 msgid "No partner !"
 msgstr "Pas de partenaire !"
 
+#~ msgid "VAT"
+#~ msgstr "TVA"
+
 #~ msgid "Repairs"
 #~ msgstr "Réparations"
 
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index ed579111c0d..3aab3ba0656 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,8 +170,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "वैट"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -783,6 +783,9 @@ msgstr ""
 #~ msgid "Repair Order Ref"
 #~ msgstr "मरम्मत के आदेश संदर्भ"
 
+#~ msgid "VAT"
+#~ msgstr "वैट"
+
 #~ msgid "Repair Fees line"
 #~ msgstr "मरम्मत शुल्क लाइन"
 
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index 1c9ee5684f9..f7870013e05 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -185,8 +185,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -806,5 +806,8 @@ msgstr "Spremno za popravak"
 msgid "No partner !"
 msgstr ""
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Kreirati račun(e) ?"
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index 140027c8895..eed7cc7f539 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,8 +170,8 @@ msgstr "Vigyázat!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "ÁFA"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -777,5 +777,8 @@ msgstr ""
 msgid "No partner !"
 msgstr "Nincs partner!"
 
+#~ msgid "VAT"
+#~ msgstr "ÁFA"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Valóban el akarja készíteni a számlá(ka)t?"
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index 73d46eefe95..c5a715bf5b9 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/i18n/id.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index ac804044667..a93f02cac15 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr "Attenzione!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -784,6 +784,9 @@ msgstr "Nessun partner!"
 #~ msgid "Repair Order Ref"
 #~ msgstr "Rif. Ordine riparazione"
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
 
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 338d7de68db..2b28d8f1bba 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -180,8 +180,8 @@ msgstr "警告"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "消費税"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -793,3 +793,6 @@ msgstr "修理準備完了"
 #, python-format
 msgid "No partner !"
 msgstr "パートナがありません。"
+
+#~ msgid "VAT"
+#~ msgstr "消費税"
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index dd1dc6dca74..51a13009fbc 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/i18n/ko.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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,7 +170,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 7b661b27a5e..b3cf1cb3461 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/i18n/lt.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index f7543992873..82518015dea 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/i18n/nl.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -191,8 +191,8 @@ msgstr "Waarschuwing !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "BTW"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -758,7 +758,7 @@ msgstr "Verwijder"
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr "Produkt UoM"
+msgstr "Product maateenheid"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
@@ -818,6 +818,9 @@ msgstr "Gereed voor reparatie"
 msgid "No partner !"
 msgstr "Geen relatie !"
 
+#~ msgid "VAT"
+#~ msgstr "BTW"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor overzicht"
 
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 6c424a6abd1..0f680be7664 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/i18n/nl_BE.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index 5055793e582..036178a1f9b 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/i18n/pl.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "VAT"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -788,6 +788,9 @@ msgstr "Brak partnera !"
 #~ msgid "Repair State"
 #~ msgstr "Stan naprawy"
 
+#~ msgid "VAT"
+#~ msgstr "VAT"
+
 #~ msgid "Repairs in quotation"
 #~ msgstr "Naprawy w ofercie"
 
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index f10ee11ad74..acaab4321d6 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -190,8 +190,8 @@ msgstr "Atenção!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -828,6 +828,9 @@ msgstr "Nenhum Parceiro !"
 #~ msgid "Make invoices"
 #~ msgstr "Criar Facturas"
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "Repairs"
 #~ msgstr "Reparações"
 
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 1cd89664a02..6eb1ae72199 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr "Atenção !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index 8c91256235f..887b9708cde 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/i18n/ro.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -192,8 +192,8 @@ msgstr "Avertizare !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "TVA"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -843,6 +843,9 @@ msgstr "Niciun partener !"
 #~ "           * Raport cotatie reparatii\n"
 #~ "           * Note pentru tehnician si pentru clientul final\n"
 
+#~ msgid "VAT"
+#~ msgstr "TVA"
+
 #~ msgid "Products Repairs Module - Manage All products Repairs"
 #~ msgstr "Modulul Reparatii Produse - Gestionează toate Reparatiile produselor"
 
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index 58751496f16..f41e1f1b5c9 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/i18n/ru.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index 16a321ff926..c3e764f9843 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/i18n/sl.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "DDV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -793,6 +793,9 @@ msgstr ""
 #~ msgid "Repair State"
 #~ msgstr "Stanje popravila"
 
+#~ msgid "VAT"
+#~ msgstr "DDV"
+
 #~ msgid "Repairs"
 #~ msgstr "Popravila"
 
diff --git a/addons/mrp_repair/i18n/sq.po b/addons/mrp_repair/i18n/sq.po
index 61096ec3734..8343c292e16 100644
--- a/addons/mrp_repair/i18n/sq.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,7 +170,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 7c89079387b..f66154ebcb9 100644
--- a/addons/mrp_repair/i18n/sr.po
+++ b/addons/mrp_repair/i18n/sr.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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -186,8 +186,8 @@ msgstr "Upozorenje!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -823,6 +823,9 @@ msgstr "Nema partnera !"
 #~ msgid "Repair Order Ref"
 #~ msgstr "Ref.Nalog za Popravku"
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Repair Fees line"
 #~ msgstr "Dodatne Linije Popravke"
 
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 0e913194736..8a44ede0215 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -186,8 +186,8 @@ msgstr "Upozorenje!"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -817,6 +817,9 @@ msgstr "Nema partnera !"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 81317b71571..d326c90147e 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,8 +169,8 @@ msgstr "Varning !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "Moms"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -781,6 +781,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
+#~ msgid "VAT"
+#~ msgstr "Moms"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Felaktig XML för Vyarkitektur!"
 
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index 562251fcba6..078acaa976e 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/i18n/tlh.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 90945430991..8f1ed46113e 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -188,8 +188,8 @@ msgstr "Uyarı !"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "KDV"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -822,6 +822,9 @@ msgstr "Paydaş Yok !"
 #~ msgid "Repair State"
 #~ msgstr "Onarım Durum"
 
+#~ msgid "VAT"
+#~ msgstr "KDV"
+
 #~ msgid "Repairs in quotation"
 #~ msgstr "Teklifdeki Onarımlar"
 
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index d6608c0a998..14bfa2e1d2a 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/i18n/uk.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/vi.po b/addons/mrp_repair/i18n/vi.po
index 70f543586be..5b3f98caff0 100644
--- a/addons/mrp_repair/i18n/vi.po
+++ b/addons/mrp_repair/i18n/vi.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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,7 +170,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index 896df443961..a477872aa63 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -177,8 +177,8 @@ msgstr "警告！"
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
-msgstr "增值税"
+msgid "Tax"
+msgstr ""
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -785,6 +785,9 @@ msgstr "准备修理"
 msgid "No partner !"
 msgstr "没有输入业务伙伴"
 
+#~ msgid "VAT"
+#~ msgstr "增值税"
+
 #~ msgid "Status"
 #~ msgstr "状态"
 
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index c6872a43a62..22b842543b1 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/i18n/zh_TW.po
@@ -13,8 +13,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-07-14 06:13+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:08+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -169,7 +169,7 @@ msgstr ""
 
 #. module: mrp_repair
 #: report:repair.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: mrp_repair
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index d9c6ad71004..991e7876843 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "تحذير !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ضريبة القيمة المضافة"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2413,6 +2413,9 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Configuration Progress"
 #~ msgstr "تقدم الإعدادات"
 
+#~ msgid "VAT"
+#~ msgstr "ضريبة القيمة المضافة"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    شهر- ١    "
 
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index f38ed8a9b86..1e2359a1936 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "Предупреждение !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ДДС"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2188,6 +2188,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Reference"
 #~ msgstr "Отпратка"
 
+#~ msgid "VAT"
+#~ msgstr "ДДС"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index fc7cca1fec4..354439ed5f3 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2286,6 +2286,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Our Salesman"
 #~ msgstr "Naš Prodavač"
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Samo isporuka"
 
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 02c11057ac4..b47aeb04e49 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Avís!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2494,6 +2494,9 @@ msgstr "Factura des d'albarans"
 #~ "la comanda de venda. Aquesta transacció converteix la comanda de venda a "
 #~ "factures."
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crea factura"
 
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 03610618ecd..562aa26664f 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale
@@ -87,8 +87,8 @@ msgstr "Varování !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "DPH"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2202,6 +2202,9 @@ msgstr "Faktura založená na dodávce"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Platba před doručením"
 
+#~ msgid "VAT"
+#~ msgstr "DPH"
+
 #~ msgid "All at Once"
 #~ msgstr "Vše najednou"
 
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 4dd21480065..ebea93e173b 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Advarsel!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "Moms"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2165,6 +2165,9 @@ msgstr "År"
 msgid "Invoice Based on Deliveries"
 msgstr ""
 
+#~ msgid "VAT"
+#~ msgstr "Moms"
+
 #~ msgid "  Year  "
 #~ msgstr "  År  "
 
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 6e7eefbf3cf..aadc82565c6 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Warnung !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "USt."
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2501,6 +2501,9 @@ msgstr "Rechnung durch Lieferung"
 #~ "Rechnung' angeklickt wird. Dieser Vorgang verschiebt den Verkaufsauftrag zu "
 #~ "den Rechnungen."
 
+#~ msgid "VAT"
+#~ msgstr "USt."
+
 #~ msgid "Make Invoice"
 #~ msgstr "Erzeuge Rechnung"
 
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 6dc0d1c8ca4..d919dc2071f 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Προειδοποίηση!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ΦΠΑ"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2227,6 +2227,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Reference"
 #~ msgstr "Παραπομπή"
 
+#~ msgid "VAT"
+#~ msgstr "ΦΠΑ"
+
 #~ msgid "Procure Method"
 #~ msgstr "Μέθοδος Προμήθειας"
 
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 5326d9f13ec..61f2fd976a5 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,8 +91,8 @@ msgstr "¡Aviso!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "CIF/NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -3000,3 +3000,6 @@ msgstr "Facturar desde albaranes"
 
 #~ msgid "Ordered Date"
 #~ msgstr "Fecha pedido"
+
+#~ msgid "VAT"
+#~ msgstr "CIF/NIF"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 6e739de4b74..59284ec10cd 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2170,6 +2170,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Reference"
 #~ msgstr "Referencia"
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index 9d20a2ec2c2..0ecd4353144 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "¡Aviso!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2274,6 +2274,9 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Pago antes del envío"
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "All at Once"
 #~ msgstr "Todo a la vez"
 
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index fb4f3cd2a3c..3aa9d2262c8 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 "Language: \n"
 
 #. module: sale
@@ -91,8 +91,8 @@ msgstr "¡Aviso!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2382,6 +2382,9 @@ msgstr "Año"
 msgid "Invoice Based on Deliveries"
 msgstr "Facturar desde albaranes"
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Desea crear la(s) factura(s)?"
 
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 361d651a110..94d4d958295 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "¡Advertencia!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "VAT"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2567,6 +2567,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
 
+#~ msgid "VAT"
+#~ msgstr "VAT"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr ""
 #~ "Configurar la Politica de paquete de productos de los pedidos de ventas"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index c373ae66644..799c62c28cf 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -155,8 +155,8 @@ msgstr "Hoiatus!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "KM"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2487,6 +2487,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "My Sales Order"
 #~ msgstr "Minu müügikorraldus"
 
+#~ msgid "VAT"
+#~ msgstr "KM"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Kohaletoimetamine laost kliendile."
 
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index a1149147d70..5ef37fea35e 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,8 +91,8 @@ msgstr "Varoitus !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ALV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2269,6 +2269,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Outgoing Products"
 #~ msgstr "Lähtevät tuotteet"
 
+#~ msgid "VAT"
+#~ msgstr "ALV"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index a1207be3bab..97cd0137c97 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
@@ -130,8 +130,8 @@ msgstr "Attention !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "TVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2638,6 +2638,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Direct Delivery"
 #~ msgstr "Livraison directe"
 
+#~ msgid "VAT"
+#~ msgstr "TVA"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Créer facture"
 
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index 8d5aa806c80..81a6facac29 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,7 +87,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index e802d9d3b75..f567ee5169a 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -91,8 +91,8 @@ msgstr "Upozorenje !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2453,6 +2453,9 @@ msgstr "Faktura na temelju dostava"
 #~ "Račun se kreira kada se klikne na 'Kriraj Račun' nakon potvrde Prodajne "
 #~ "Narudžbe. Ova transakcija prenosi podatke Prodajne Narudžbe u Račune."
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Vezane Prodajne Narudžbe"
 
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 97f0fe59171..d97ff49cc78 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Figyelem!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ÁFA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2271,6 +2271,9 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Reference"
 #~ msgstr "Hivatkozás"
 
+#~ msgid "VAT"
+#~ msgstr "ÁFA"
+
 #~ msgid "Net Price"
 #~ msgstr "Nettó ár"
 
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 0fc14082a31..1439af92090 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Peringatan !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "VAT"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2663,3 +2663,6 @@ msgstr "Invoice berdasarkan pengiriman"
 
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Langkah-langkah untuk pengiriman sales order."
+
+#~ msgid "VAT"
+#~ msgstr "VAT"
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index 0f5351587ad..13a74f4c2a3 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/i18n/is.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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Aðvörun !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "VSK"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2171,3 +2171,6 @@ msgstr ""
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr ""
+
+#~ msgid "VAT"
+#~ msgstr "VSK"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index ddfc2f09e6f..a4872985e17 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "Attenzione!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2500,6 +2500,9 @@ msgstr "Fattura basata su Consegne"
 #~ "l'ordine di vendita. Questa transazione crea una fattura sulla base "
 #~ "dell'ordine di vendita."
 
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crea fattura"
 
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 1e88262f8bb..50c3722876a 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,8 +87,8 @@ msgstr "警告"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "消費税"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2283,3 +2283,6 @@ msgstr "年"
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr "配達基準の請求書"
+
+#~ msgid "VAT"
+#~ msgstr "消費税"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 594032bc105..8dadcc0c5de 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,8 +87,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "VAT"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2205,6 +2205,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Origin"
 #~ msgstr "기원"
 
+#~ msgid "VAT"
+#~ msgstr "VAT"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 47b6c90d2cc..305a1fd8664 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Įspėjimas!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PVM"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2185,6 +2185,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Origin"
 #~ msgstr "Kilmė"
 
+#~ msgid "VAT"
+#~ msgstr "PVM"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatinis deklaravimas"
 
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index fba2e67f98f..eb1f56507dd 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,8 +87,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PVN"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2181,6 +2181,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Invoice after delivery"
 #~ msgstr "Rēķins pēc piegādes"
 
+#~ msgid "VAT"
+#~ msgstr "PVN"
+
 #~ msgid "Outgoing Products"
 #~ msgstr "Izejošā Produkcija"
 
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 547daf2db0b..2fc96bd7db5 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,8 +91,8 @@ msgstr "Анхаар !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "НӨАТ"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2359,6 +2359,9 @@ msgstr "Жил"
 msgid "Invoice Based on Deliveries"
 msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 
+#~ msgid "VAT"
+#~ msgstr "НӨАТ"
+
 #~ msgid "Sale Order"
 #~ msgstr "Борлуулах захиалга"
 
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index 6eb4c6e19e5..849ac26783a 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,8 +91,8 @@ msgstr "Advarsel !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "MVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2208,6 +2208,9 @@ msgstr "Faktura basert på leveringer"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Betaling før levering"
 
+#~ msgid "VAT"
+#~ msgstr "MVA"
+
 #~ msgid "All at Once"
 #~ msgstr "Alt på en gang"
 
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index a074ba3dfb0..883d8f3b509 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -13,8 +13,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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -90,8 +90,8 @@ msgstr "Waarschuwing !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "BTW"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -372,7 +372,7 @@ msgid ""
 "Product Category or Fiscal Position is not defined !"
 msgstr ""
 "Er is geen categorie opbrengstrekening gedefinieerd in de standaard "
-"eigenschappen van de productcategorie of fiscale situatie niet gedefinieerd !"
+"eigenschappen van de productcategorie of fiscale positie niet gedefinieerd !"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -454,7 +454,7 @@ msgstr "Offertedatum"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Fiscale situatie"
+msgstr "Fiscale positie"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
@@ -1713,7 +1713,7 @@ msgstr "Handmatig in behandeling"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr "Product meeteenheid"
+msgstr "Product maateenheid"
 
 #. module: sale
 #: view:sale.order:0
@@ -2602,6 +2602,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "geven verkooporder. Deze handeling verplaatst de verkooporder naar de "
 #~ "facturen."
 
+#~ msgid "VAT"
+#~ msgstr "BTW"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Maak factuur"
 
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index 41853d574a2..49a664ab6cf 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -91,8 +91,8 @@ msgstr "Waarschuwing"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "Btw"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2377,6 +2377,9 @@ msgstr "Factuur op basis van zendnota's"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Vooruitbetaling"
 
+#~ msgid "VAT"
+#~ msgstr "Btw"
+
 #~ msgid "All at Once"
 #~ msgstr "Complete leveringen"
 
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index 2d1e93e607b..aea018e7d08 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,7 +87,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index e62531c01e4..9e75ec4af00 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -90,8 +90,8 @@ msgstr "Ostrzeżenie !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "NIP"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2709,6 +2709,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Projekt faktury dla klienta do sprawdzenia księgowego"
 
+#~ msgid "VAT"
+#~ msgstr "NIP"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index cf6bebbec98..6b0c5fd3ab4 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -90,8 +90,8 @@ msgstr "Aviso !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "NIF"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -3086,3 +3086,6 @@ msgstr "Fatura Baseada em Entregas"
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Deseja realmente criar a fatura(s) ?"
+
+#~ msgid "VAT"
+#~ msgstr "NIF"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 4b213456a7d..a8256204d5a 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Aviso !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "Imposto"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2280,6 +2280,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invoice after delivery"
 #~ msgstr "Faturar depois de entreguar"
 
+#~ msgid "VAT"
+#~ msgstr "Imposto"
+
 #~ msgid "Origin"
 #~ msgstr "Origem"
 
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 0f944a0d9e4..45738b758a6 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -90,8 +90,8 @@ msgstr "Avertizare !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "TVA"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2393,6 +2393,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
+#~ msgid "VAT"
+#~ msgstr "TVA"
+
 #~ msgid "Packing"
 #~ msgstr "Împachetare"
 
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 2286a8b9971..a62be53408f 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "Внимание!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "НДС"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2283,6 +2283,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Sale Order"
 #~ msgstr "Заказ"
 
+#~ msgid "VAT"
+#~ msgstr "НДС"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Позиции заказа"
 
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index f385f207254..55c638674d0 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,8 +87,8 @@ msgstr "Varovanie!"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "DPH"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2252,6 +2252,9 @@ msgstr ""
 #~ msgid "Packing Policy"
 #~ msgstr "Podmienky balenia"
 
+#~ msgid "VAT"
+#~ msgstr "DPH"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatné XML pre zobrazenie architektúry!"
 
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 3df83d235aa..cee0e17d3ae 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "Opozorilo !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "DDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2294,6 +2294,9 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Direct Delivery"
 #~ msgstr "Direktna dostava"
 
+#~ msgid "VAT"
+#~ msgstr "DDV"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Postavke prodajnega naloga"
 
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index 5e94d3956b8..5bed8cb0ccb 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:06+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,7 +87,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 572ce524c7d..4cad9147ec7 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Upozorenje !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2459,6 +2459,9 @@ msgstr "Račun na osnovu isporuke"
 #~ "Račun je kreiran kada je kliknuto 'Kreiranje račun' nakon potvrde naloga za "
 #~ "prodaju. Ovaj proces prenosi nalog za prodaju do računa."
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Isključivo nalog za isporuku"
 
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 9350bb4ed1e..befa922b816 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/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-07-14 06:01+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Upozorenje !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "PDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2185,6 +2185,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Plaćanje pre isporuke"
 
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
 #~ msgid "All at Once"
 #~ msgstr "Sve odjednom"
 
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 0fa027ff3b1..f96295a5be7 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -90,8 +90,8 @@ msgstr "Varning !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "Moms"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2480,6 +2480,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Sales Process"
 #~ msgstr "Kundorderprocess"
 
+#~ msgid "VAT"
+#~ msgstr "Moms"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Endast leveransorder"
 
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index fadb12bd016..2c0e2691dfd 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -87,8 +87,8 @@ msgstr "คำเตือน !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ภาษีมูลค่าเพิ่ม (VAT)"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2166,6 +2166,9 @@ msgstr ""
 #~ msgid "All at Once"
 #~ msgstr "ทั้วหมดในครั้งเดียว"
 
+#~ msgid "VAT"
+#~ msgstr "ภาษีมูลค่าเพิ่ม (VAT)"
+
 #~ msgid "Configure"
 #~ msgstr "ตั้งค่า"
 
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 143197536b4..cdff94156e4 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -86,7 +86,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
+msgid "Tax"
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 0f4e6b89cc8..d68060cf433 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -88,8 +88,8 @@ msgstr "Uyarı"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "KDV"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2252,6 +2252,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Reference"
 #~ msgstr "Referans"
 
+#~ msgid "VAT"
+#~ msgstr "KDV"
+
 #~ msgid "Net Price"
 #~ msgstr "Net Fiyat"
 
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index a5950553653..bfe3683cb29 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -86,8 +86,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "ПДВ"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2284,6 +2284,9 @@ msgstr ""
 #~ msgid "Direct Delivery"
 #~ msgstr "Пряма Доставка"
 
+#~ msgid "VAT"
+#~ msgstr "ПДВ"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Виписати інвойс"
 
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index fb3bc012541..a94a024cc73 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -89,8 +89,8 @@ msgstr "Cảnh báo !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "Thuế GTGT"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2611,6 +2611,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Cho phép bạn tính toán chi phí giao hàng trên Đơn chào hàng của bạn"
 
+#~ msgid "VAT"
+#~ msgstr "Thuế GTGT"
+
 #~ msgid "Configure"
 #~ msgstr "Cấu hình"
 
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index fbd99435bf9..dc70e1ecc7d 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -86,8 +86,8 @@ msgstr "警告 !"
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "增值税"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2195,6 +2195,9 @@ msgstr "年"
 msgid "Invoice Based on Deliveries"
 msgstr "发票基于送货单"
 
+#~ msgid "VAT"
+#~ msgstr "增值税"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "发票草稿"
 
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 75d604ae074..99d07991b52 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -13,8 +13,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-07-14 06:00+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
+"X-Generator: Launchpad (build 15654)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@@ -86,8 +86,8 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "增值稅(VAT)"
+msgid "Tax"
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -2379,6 +2379,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Direct Delivery"
 #~ msgstr "直接交貨"
 
+#~ msgid "VAT"
+#~ msgstr "增值稅(VAT)"
+
 #~ msgid "Make Invoice"
 #~ msgstr "開立發票"