From c4dd49d31776a0e3f083a16f883cea76d569ae27 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:05:58 +0500
Subject: [PATCH 01/19] [IMP]Improved value in breadcrumb

bzr revid: pza@tinyerp.com-20131030130558-akqntn5k4rjhx771
---
 addons/mail/mail_mail.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 8e99655dddb..01d48c73d6a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -68,6 +68,9 @@ class mail_mail(osv.Model):
         'state': 'outgoing',
     }
 
+    def name_get(self, cr, uid, ids, context=None):
+        return [(mail["id"], "%s" % (mail['subject'] or "New Mail")) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
+
     def default_get(self, cr, uid, fields, context=None):
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)
         # To remove when automatic context propagation is removed in web client

From a59de2a106ff4e835b42b917ecbbb24f67c8eefb Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:10:55 +0500
Subject: [PATCH 02/19] [IMP]Added warning when user clicks on send button and
 server is not configured

bzr revid: pza@tinyerp.com-20131030131055-ljewgj0zz86hxzli
---
 addons/mail/mail_mail.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 01d48c73d6a..fa04e249b90 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -242,6 +242,14 @@ class mail_mail(osv.Model):
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
+        mail_connection = ir_mail_server.search(cr, uid, [], order='sequence', limit=1)
+        smtp_server = ir_mail_server.browse(cr, uid, mail_connection, context=context)[0]
+        try:
+            connection = ir_mail_server.connect(smtp_server.smtp_host, smtp_server.smtp_port, user=smtp_server.smtp_user,
+                                password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption,
+                                smtp_debug=smtp_server.smtp_debug)
+        except:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base.menu_mail_servers)s."), context)
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # handle attachments

From e8c99922de2f4972feb9cb6e55fe9359a0776023 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:15:32 +0500
Subject: [PATCH 03/19] [IMP]Added statusbar

bzr revid: pza@tinyerp.com-20131030131532-6viz67uodbxrfcww
---
 addons/mail/mail_mail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index dd6a78fd8a4..3486a0128a7 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -10,6 +10,7 @@
                         <button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
                         <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
                         <button name="cancel" string="Cancel" type="object" states='outgoing'/>
+                        <field name="state" widget="statusbar" statusbar_visible="outgoing,sent,received,exception,cancel"/>
                     </header>
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
@@ -36,7 +37,6 @@
                                         <group string="Status">
                                             <field name="auto_delete"/>
                                             <field name="type"/>
-                                            <field name="state"/>
                                             <field name="mail_server_id"/>
                                             <field name="model"/>
                                             <field name="res_id"/>

From de35c79933c01ff274cc7a277ebb5b91ba126471 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:18:06 +0500
Subject: [PATCH 04/19] [IMP]Removed Recipient from advance tab as it already
 comes in 'To' field

bzr revid: pza@tinyerp.com-20131030131806-1s18ti71vp93qlbv
---
 addons/mail/mail_mail_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 3486a0128a7..75c404ae050 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -48,7 +48,6 @@
                                             <field name="references"/>
                                         </group>
                                         <group string="Recipients">
-                                            <field name="partner_ids" widget="many2many_tags"/>
                                             <field name="notified_partner_ids" widget="many2many_tags"/>
                                         </group>
                                     </div>

From aa5044d3dd2a4ac9e2b7a4cf27a76363cc79c638 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:22:24 +0500
Subject: [PATCH 05/19] [IMP]Made 'From' field required.

bzr revid: pza@tinyerp.com-20131030132224-nh373kqfyruvy3mz
---
 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 72ccdc83bb6..3702ec77d76 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -154,7 +154,7 @@ class mail_message(osv.Model):
             help="Message type: email for email message, notification for system "\
                  "message, comment for other messages such as user replies"),
         'email_from': fields.char('From',
-            help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
+            help="Email address of the sender. This field is set when no matching partner is found for incoming emails.", required=True),
         'reply_to': fields.char('Reply-To',
             help='Reply email address. Setting the reply_to bypasses the automatic thread creation.'),
         'author_id': fields.many2one('res.partner', 'Author', select=1,

From f1b2bff79b499a23046b7dd6476b52fb1a2bac0a Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 30 Oct 2013 18:23:43 +0500
Subject: [PATCH 06/19] [IMP]Made 'Date' field readonly.

bzr revid: pza@tinyerp.com-20131030132343-tbjrl6relnj1r1ir
---
 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 3702ec77d76..13e7fa2a35d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -179,7 +179,7 @@ class mail_message(osv.Model):
             string='Notifications', auto_join=True,
             help='Technical field holding the message notifications. Use notified_partner_ids to access notified partners.'),
         'subject': fields.char('Subject'),
-        'date': fields.datetime('Date'),
+        'date': fields.datetime('Date', readonly=1),
         'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'to_read': fields.function(_get_to_read, fnct_search=_search_to_read,

From 34224c45e1b169cf33c8344516f269630e8068fa Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Fri, 1 Nov 2013 11:19:45 +0500
Subject: [PATCH 07/19] [MISC]Revert rev 8962

bzr revid: pza@tinyerp.com-20131101061945-is98vb8lane02hb6
---
 addons/mail/mail_mail.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index fa04e249b90..9c9ee526799 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -68,9 +68,6 @@ class mail_mail(osv.Model):
         'state': 'outgoing',
     }
 
-    def name_get(self, cr, uid, ids, context=None):
-        return [(mail["id"], "%s" % (mail['subject'] or "New Mail")) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
-
     def default_get(self, cr, uid, fields, context=None):
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)
         # To remove when automatic context propagation is removed in web client

From 66850dbe56ba172789231eda30eed95ac77d475b Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Fri, 1 Nov 2013 11:28:06 +0500
Subject: [PATCH 08/19] [MISC]Revert rev 8963

bzr revid: pza@tinyerp.com-20131101062806-bcbmvwnvm4lig5n9
---
 addons/mail/mail_mail.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 9c9ee526799..8e99655dddb 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -239,14 +239,6 @@ class mail_mail(osv.Model):
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
-        mail_connection = ir_mail_server.search(cr, uid, [], order='sequence', limit=1)
-        smtp_server = ir_mail_server.browse(cr, uid, mail_connection, context=context)[0]
-        try:
-            connection = ir_mail_server.connect(smtp_server.smtp_host, smtp_server.smtp_port, user=smtp_server.smtp_user,
-                                password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption,
-                                smtp_debug=smtp_server.smtp_debug)
-        except:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base.menu_mail_servers)s."), context)
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # handle attachments

From a6769160028db273da13c23efc5386626e5cccf2 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Fri, 1 Nov 2013 12:38:21 +0500
Subject: [PATCH 09/19] [IMP]Improved value in breadcrumb

bzr revid: pza@tinyerp.com-20131101073821-dugeqgue1a0o4ry5
---
 addons/mail/mail_mail.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 8e99655dddb..01d48c73d6a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -68,6 +68,9 @@ class mail_mail(osv.Model):
         'state': 'outgoing',
     }
 
+    def name_get(self, cr, uid, ids, context=None):
+        return [(mail["id"], "%s" % (mail['subject'] or "New Mail")) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
+
     def default_get(self, cr, uid, fields, context=None):
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)
         # To remove when automatic context propagation is removed in web client

From c84de24914bc5ab4cdc53e4c8d9ec805e911af28 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 6 Nov 2013 15:08:01 +0500
Subject: [PATCH 10/19] [IMP]Improved alias name in breadcrumb

bzr revid: pza@tinyerp.com-20131106100801-yqn2stp7an2ir50f
---
 addons/mail/mail_alias.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 97d2842d15c..1fd24d85e55 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -137,8 +137,10 @@ class mail_alias(osv.Model):
         for record in self.browse(cr, uid, ids, context=context):
             if record.alias_name and record.alias_domain:
                 res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
+            elif record.alias_name:
+                res.append((record['id'], "%s" % (record.alias_name)))
             else:
-                res.append((record['id'], False))
+                res.append((record['id'], "New Alias"))
         return res
 
     def _find_unique(self, cr, uid, name, context=None):

From 544cde75e085af6d750fc30dc2b8b4cb3f220298 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 6 Nov 2013 15:17:07 +0500
Subject: [PATCH 11/19] [IMP]Improved docstring on alias name_get

bzr revid: pza@tinyerp.com-20131106101707-bca1jcoqgsxg95b9
---
 addons/mail/mail_alias.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 1fd24d85e55..c876439484d 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -129,9 +129,9 @@ class mail_alias(osv.Model):
     ]
 
     def name_get(self, cr, uid, ids, context=None):
-        """Return the mail alias display alias_name, inclusing the implicit
-           mail catchall domain from config.
-           e.g. `jobs@openerp.my.openerp.com` or `sales@openerp.my.openerp.com`
+        """Return the mail alias display alias_name, including the implicit
+           mail catchall domain if exists from config otherwise "New Alias".
+           e.g. `jobs@openerp.my.openerp.com` or `jobs` or 'New Alias'
         """
         res = []
         for record in self.browse(cr, uid, ids, context=context):

From 24a976502c3865f3af3dee8bc0df9f5899ba9026 Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 6 Nov 2013 16:09:25 +0500
Subject: [PATCH 12/19] [IMP]Improved logo align for webkit report

bzr revid: pza@tinyerp.com-20131106110925-5ncq3u8rb8r1xmdj
---
 addons/report_webkit/header_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index 30407f89385..a5b4add8a8d 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -5,12 +5,12 @@
             <field name="model">ir.header_img</field>
             <field name="arch" type="xml">
                 <form string="Header Image" version="7.0">
+                    <field name="img" widget="image" class="oe_left"/>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
-                        <field name='company_id' />
+                        <field name="company_id"/>
                     </group>
-                    <field name="img" widget="image" class="oe_right"/>
                 </form>
             </field>
         </record>

From 528e6b7cc79421b9bb96204f935ad60b565515de Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 6 Nov 2013 18:39:48 +0500
Subject: [PATCH 13/19] [IMP]Removed required from field 'email_from'

bzr revid: pza@tinyerp.com-20131106133948-pmu3otkqgyr036ch
---
 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 13e7fa2a35d..e93eee01f4a 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -154,7 +154,7 @@ class mail_message(osv.Model):
             help="Message type: email for email message, notification for system "\
                  "message, comment for other messages such as user replies"),
         'email_from': fields.char('From',
-            help="Email address of the sender. This field is set when no matching partner is found for incoming emails.", required=True),
+            help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
         'reply_to': fields.char('Reply-To',
             help='Reply email address. Setting the reply_to bypasses the automatic thread creation.'),
         'author_id': fields.many2one('res.partner', 'Author', select=1,

From 737b920c744ea135609be8a79f525b1a68b52f1d Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Wed, 6 Nov 2013 18:41:35 +0500
Subject: [PATCH 14/19] [IMP]Added partner_ids

bzr revid: pza@tinyerp.com-20131106134135-wqfrgbrtu8nw8415
---
 addons/mail/mail_mail_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 75c404ae050..3486a0128a7 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -48,6 +48,7 @@
                                             <field name="references"/>
                                         </group>
                                         <group string="Recipients">
+                                            <field name="partner_ids" widget="many2many_tags"/>
                                             <field name="notified_partner_ids" widget="many2many_tags"/>
                                         </group>
                                     </div>

From 2df90649561895ac3a2d4af2c8b11e801edd28ff Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Thu, 21 Nov 2013 16:14:09 +0530
Subject: [PATCH 15/19] [IMP]Improve Label

bzr revid: prajapatijitendra7969@gmail.com-20131121104409-pjev6x12hb86tutu
---
 addons/process/process_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 7e0f9c25f47..60a4ad8d4f0 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -180,12 +180,14 @@
                             </field>
                         </page>
                         <page string="Transitions">
+                            <separator name="transition_in" string="Starting Transitions"/>
                             <field name="transition_in" nolabel="1" height="400">
                                 <tree string="Incoming Transitions">
                                     <field name="name"/>
                                     <field name="source_node_id"/>
                                 </tree>
                             </field>
+                            <separator name="transition_out" string="Ending Transitions"/>
                             <field name="transition_out" nolabel="1" height="400">
                                 <tree string="Outgoing Transitions">
                                     <field name="name"/>

From 76d284ab8e4fb8be69ca11a96f3dd549df37bd2a Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <jpr@tinyerp.com>
Date: Thu, 10 Apr 2014 14:06:55 +0530
Subject: [PATCH 16/19] [IMP]set python string is translated

bzr revid: jpr@tinyerp.com-20140410083655-6m993y17nckk7mfz
---
 addons/mail/mail_alias.py | 3 ++-
 addons/mail/mail_mail.py  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 66bf5eb4df4..3a2ec0a7ce6 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -27,6 +27,7 @@ from openerp.osv import fields, osv
 from openerp.tools import ustr
 from openerp.modules.registry import RegistryManager
 from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -140,7 +141,7 @@ class mail_alias(osv.Model):
             elif record.alias_name:
                 res.append((record['id'], "%s" % (record.alias_name)))
             else:
-                res.append((record['id'], "New Alias"))
+                res.append((record['id'], _("New Alias")))
         return res
 
     def _find_unique(self, cr, uid, name, context=None):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index b40f4b5f772..007d7a1900c 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -69,7 +69,7 @@ class mail_mail(osv.Model):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        return [(mail["id"], "%s" % (mail['subject'] or "New Mail")) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
+        return [(mail["id"], "%s" % (mail['subject'] or _("New Mail"))) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
 
     def default_get(self, cr, uid, fields, context=None):
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)

From e8d8762c7711666c67a589599199798580763442 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <jpr@tinyerp.com>
Date: Tue, 6 May 2014 16:16:21 +0530
Subject: [PATCH 17/19] [IMP]override name_search method and set _rec_name on
 subject in mail_mail

bzr revid: jpr@tinyerp.com-20140506104621-7gryl1gpv1hrmfvr
---
 addons/mail/mail_alias.py | 16 ++++++++++++----
 addons/mail/mail_mail.py  |  4 +---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 3a2ec0a7ce6..ae058e65ea5 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -136,14 +136,22 @@ class mail_alias(osv.Model):
         """
         res = []
         for record in self.browse(cr, uid, ids, context=context):
-            if record.alias_name and record.alias_domain:
+            if record.alias_name or record.alias_domain:
                 res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
-            elif record.alias_name:
-                res.append((record['id'], "%s" % (record.alias_name)))
             else:
-                res.append((record['id'], _("New Alias")))
+                res.append((record['id'], _("Inactive Alias")))
         return res
 
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args = []
+        ids = []
+        if name:
+            ids = self.search(cr, user, ['|',('alias_name', operator, name),('alias_domain', operator, name)] + args, limit=limit)
+        else:
+            ids = self.search(cr, user, args, context=context, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+
     def _find_unique(self, cr, uid, name, context=None):
         """Find a unique alias name similar to ``name``. If ``name`` is
            already taken, make a variant by adding an integer suffix until
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index cf994e1da43..3f6582481cf 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -41,6 +41,7 @@ class mail_mail(osv.Model):
     _description = 'Outgoing Mails'
     _inherits = {'mail.message': 'mail_message_id'}
     _order = 'id desc'
+    _rec_name = 'subject'
 
     _columns = {
         'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
@@ -68,9 +69,6 @@ class mail_mail(osv.Model):
         'state': 'outgoing',
     }
 
-    def name_get(self, cr, uid, ids, context=None):
-        return [(mail["id"], "%s" % (mail['subject'] or _("New Mail"))) for mail in self.read(cr, uid, ids, ['subject'], context=context)]
-
     def default_get(self, cr, uid, fields, context=None):
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)
         # To remove when automatic context propagation is removed in web client

From 79de0ce79b5d9591ed7d5ed34fbd48e8c13531d8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 6 May 2014 17:52:30 +0530
Subject: [PATCH 18/19] [IMP]: improve code

bzr revid: mga@tinyerp.com-20140506122230-5kf1l77cjt7di32p
---
 addons/mail/mail_mail_view.xml | 2 +-
 addons/mail/mail_message.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index e1ac2e652b2..1eec45843c3 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -17,7 +17,7 @@
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
                         <div style="vertical-align: top;">
-                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" readonly="1" class="oe_inline"/>
                             <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                 context="{'default_composition_mode':'reply', 'default_parent_id': mail_message_id}" states='received,sent,exception,cancel'/>
                         </div>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 275c43f4b37..5b716a14ef2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -151,7 +151,7 @@ class mail_message(osv.Model):
             string='Notifications', auto_join=True,
             help='Technical field holding the message notifications. Use notified_partner_ids to access notified partners.'),
         'subject': fields.char('Subject'),
-        'date': fields.datetime('Date', readonly=1),
+        'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'to_read': fields.function(_get_to_read, fnct_search=_search_to_read,

From 6eeb3eab4990acdcbaa9b63972127f6fa32f018c Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <jpr@tinyerp.com>
Date: Wed, 7 May 2014 12:07:55 +0530
Subject: [PATCH 19/19] [REM]:process_view.xml.THIS

bzr revid: jpr@tinyerp.com-20140507063755-n17cv0pbcxmdz70p
---
 addons/process/process_view.xml.THIS | 325 ---------------------------
 1 file changed, 325 deletions(-)
 delete mode 100644 addons/process/process_view.xml.THIS

diff --git a/addons/process/process_view.xml.THIS b/addons/process/process_view.xml.THIS
deleted file mode 100644
index 60a4ad8d4f0..00000000000
--- a/addons/process/process_view.xml.THIS
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-<data>
-
-    <menuitem
-        id="menu_process"
-        name="Enterprise Process"
-        parent="base.menu_custom"/>
-
-    <!-- Views for Process -->
-    <record model="ir.ui.view" id="view_process_form">
-        <field name="name">process.process.form</field>
-        <field name="model">process.process</field>
-        <field name="arch" type="xml">
-            <form string="Process" version="7.0">
-                <sheet>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="active"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Nodes">
-                            <field name="node_ids" colspan="4" nolabel="1">
-                                <tree string="Process Nodes">
-                                    <field name="name"/>
-                                    <field name="model_id"/>
-                                    <field name="kind"/>
-                                    <field name="flow_start"/>
-                                </tree>
-                                <form string="Process Node" version="7.0">
-                                    <group>
-                                        <group>
-                                            <field name="name"/>
-                                            <field name="flow_start"/>
-                                        </group>
-                                        <group>
-                                            <field name="kind"/>
-                                            <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                                        </group>
-                                    </group>
-                                    
-                                    <notebook colspan="4">
-                                        <page string="Properties">
-                                            <group colspan="4" col="6">
-                                                <field name="model_id"/>
-                                                <field name="menu_id"/>
-                                                <field name="help_url" widget="url"/>
-                                            </group>
-                                            <separator string="Conditions" colspan="4"/>
-                                            <field name="model_states"/>
-                                            <field name="condition_ids" nolabel="1" colspan="4">
-                                                <tree string="Other Conditions" editable="top">
-                                                    <field name="name"/>
-                                                    <field name="model_id"/>
-                                                    <field name="model_states"/>
-                                                </tree>
-                                            </field>
-                                        </page>
-                                        <page string="Transitions">
-                                            <group colspan="4" col="4">
-                                                <group colspan="2" col="2">
-                                                    <field name="transition_in" nolabel="1" height="400">
-                                                        <tree string="Incoming Transitions">
-                                                            <field name="name"/>
-                                                            <field name="source_node_id"/>
-                                                        </tree>
-                                                    </field>
-                                               </group>
-                                               <group colspan="2" col="2">
-                                                    <field name="transition_out" nolabel="1" height="400">
-                                                        <tree string="Outgoing Transitions">
-                                                            <field name="name"/>
-                                                            <field name="target_node_id"/>
-                                                        </tree>
-                                                    </field>
-                                               </group>
-                                            </group>
-                                        </page>
-                                        <page string="Notes">
-                                           <field name="note" nolabel="1" colspan="4"/>
-                                        </page>
-                                    </notebook>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Notes">
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_process_tree">
-        <field name="name">process.process.tree</field>
-        <field name="model">process.process</field>
-        <field name="arch" type="xml">
-            <tree string="Process">
-                <field name="name"/>
-                <field name="model_id"/>
-                <field name="active"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_process_filter" model="ir.ui.view">
-            <field name="name">process.process.filter</field>
-            <field name="model">process.process</field>
-            <field name="arch" type="xml">
-                <search string="Search Process">
-                    <field name="name" string="Process"/>
-                    <field name="model_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-    <record model="ir.actions.act_window" id="action_process_form">
-        <field name="name">Processes</field>
-        <field name="res_model">process.process</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_process_filter" />
-    </record>
-    <menuitem
-        id="menu_process_form"
-        action="action_process_form"
-        parent="menu_process"/>
-
-    <!-- Nodes -->
-    <record model="ir.ui.view" id="view_process_node_tree">
-        <field name="name">process.node.tree</field>
-        <field name="model">process.node</field>
-        <field name="arch" type="xml">
-            <tree string="Process Nodes">
-                <field name="name"/>
-                <field name="process_id"/>
-                <field name="model_id"/>
-                <field name="kind"/>
-                <field name="flow_start"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_process_node_form">
-        <field name="name">process.node.form</field>
-        <field name="model">process.node</field>
-        <field name="arch" type="xml">
-            <form string="Process Node" version="7.0">
-                <sheet layout="auto">
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="process_id"/>
-                            <field name="flow_start"/>
-                        </group>
-                        <group>
-                            <field name="kind"/>
-                            <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Properties">
-                            <group col="4">
-                                <field name="model_id"/>
-                                <field name="menu_id"/>
-                                <field name="help_url" widget="url"/>
-                                <field name="model_states"/>
-                            </group>
-                            <field name="condition_ids">
-                                <tree string="Other Conditions" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="model_id"/>
-                                    <field name="model_states"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Transitions">
-                            <separator name="transition_in" string="Starting Transitions"/>
-                            <field name="transition_in" nolabel="1" height="400">
-                                <tree string="Incoming Transitions">
-                                    <field name="name"/>
-                                    <field name="source_node_id"/>
-                                </tree>
-                            </field>
-                            <separator name="transition_out" string="Ending Transitions"/>
-                            <field name="transition_out" nolabel="1" height="400">
-                                <tree string="Outgoing Transitions">
-                                    <field name="name"/>
-                                    <field name="target_node_id"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Notes">
-                           <field name="note"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="view_process_node_filter" model="ir.ui.view">
-        <field name="name">process.node.filter</field>
-        <field name="model">process.node</field>
-        <field name="arch" type="xml">
-            <search string="Search ProcessNode">
-                <field name="name" string="Process Node"/>
-                <field name="kind" />
-                <field name="model_id"/>
-                <group expand="0" string="Group By...">
-                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                    <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_process_node_form">
-        <field name="name">Process Nodes</field>
-        <field name="res_model">process.node</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_process_node_filter" />
-    </record>
-
-    <menuitem
-        id="menu_process_node_form"
-        action="action_process_node_form"
-        parent="menu_process"/>
-
-    <!-- Transitions -->
-
-    <record model="ir.ui.view" id="view_process_transition_tree">
-        <field name="name">process.transition.tree</field>
-        <field name="model">process.transition</field>
-        <field name="arch" type="xml">
-            <tree string="Process Transition">
-                <field name="name"/>
-                <field name="source_node_id"/>
-                <field name="target_node_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_process_transition_form">
-        <field name="name">process.transition.form</field>
-        <field name="model">process.transition</field>
-        <field name="arch" type="xml">
-            <form string="Process Transition" version="7.0">
-                <sheet >
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="source_node_id"/>
-                        <field name="target_node_id"/>
-                    </group>
-                    <notebook>
-                        <page string="Actions">
-                            <field name="action_ids">
-                                <tree string="Actions">
-                                    <field name="name"/>
-                                    <field name="state"/>
-                                    <field name="action"/>
-                                </tree>
-                                <form string="Actions" version="7.0">
-                                    <group col="4">
-                                        <field name="name" colspan="4"/>
-                                        <field name="state"/>
-                                        <field name="action"/>
-                                    </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Workflow Transitions">
-                            <field name="transition_ids"/>
-                        </page>
-                        <page string="Associated Groups">
-                            <field name="group_ids"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note"/>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="view_process_transition_filter" model="ir.ui.view">
-        <field name="name">process.transition.filter</field>
-        <field name="model">process.transition</field>
-        <field name="arch" type="xml">
-            <search string="Search Process Transition">
-                <field name="name" string="Process Transition"/>
-                <field name="source_node_id"/>
-                <field name="target_node_id"/>
-<!--
-                <newline/>
-                <group expand="0" string="Group By..." colspan="4" col="4">
-                    <filter string="Source Node" icon="terp-personal" domain="[]" context="{'group_by':'source_node_id'}"/>
-                    <filter string="Target Node" icon="terp-personal" domain="[]" context="{'group_by':'target_node_id'}"/>
-                </group>
--->
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_process_transition_form">
-        <field name="name">Process Transitions</field>
-        <field name="res_model">process.transition</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_process_transition_filter" />
-    </record>
-    <menuitem
-        id="menu_process_transition_form"
-        action="action_process_transition_form"
-        parent="menu_process"/>
-
-</data>
-</openerp>