From b931b05bb902efca78fa0df363dda1ff29d5bf3a Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 11:03:04 +0530
Subject: [IMP] replace mailgate_message to email_message in crm, fetchamil and
 project_issue module.

bzr revid: ysa@tinyerp.com-20110207053304-yak3ruc2os2lah7t
---
 addons/project_issue/report/project_issue_report.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index b66963569e7..7d702b0e5f8 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -1,7 +1,7 @@
 
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -102,7 +102,7 @@ class project_issue_report(osv.osv):
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
+                    (SELECT count(id) FROM email_message WHERE model='project.issue' AND res_id=c.id) AS email
                 FROM
                     project_issue c
             )""")
-- 
cgit v1.2.3


From 0c7876ac291b720b787f97834ded983b21c30025 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 11:21:57 +0530
Subject: [IMP] replace mailgate.message to email.message in addons module.

bzr revid: ysa@tinyerp.com-20110207055157-yr9co24w84kv0yvy
---
 addons/project_issue/project_issue.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index aaaff37305e..9e82eb01556 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -144,7 +144,7 @@ class project_issue(crm.crm_case, osv.osv):
         issues = []
         issue_pool = self.pool.get('project.issue')
         for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
-            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])            
+            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])
         return issues
 
     def _get_issue_work(self, cr, uid, ids, context=None):
@@ -162,8 +162,8 @@ class project_issue(crm.crm_case, osv.osv):
             progress = 0.0
             if issue.task_id:
                 progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress']
-            res[issue.id] = {'progress' : progress}     
-        return res        
+            res[issue.id] = {'progress' : progress}
+        return res
 
     _columns = {
         'id': fields.integer('ID'),
@@ -213,7 +213,7 @@ class project_issue(crm.crm_case, osv.osv):
                                 method=True, multi='working_days_open', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
                                 method=True, multi='working_days_close', type="float", store=True),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'message_ids': fields.one2many('email.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
@@ -370,7 +370,7 @@ class project_issue(crm.crm_case, osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
         """
-        if context is None: 
+        if context is None:
             context = {}
         mailgate_pool = self.pool.get('email.server.tools')
 
-- 
cgit v1.2.3


From 93f54b8f038f370e8325429f7f0f017ad49475b1 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 7 Feb 2011 12:59:06 +0530
Subject: [IMP] email, email_template and email_gateway related changes done in
 addons module..

bzr revid: ysa@tinyerp.com-20110207072906-knh218shj8ufyxu7
---
 addons/project_issue/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 177533462a0..59f67eda7e0 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "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_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
+"access_email_message_project_manager","email.message.manager","email.model_email_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_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
+"access_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0
-- 
cgit v1.2.3


From 05336df19f1761c67ba2aac4e192a10663846148 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Feb 2011 15:10:16 +0530
Subject: [IMP] change module name email to emails.

bzr revid: ysa@tinyerp.com-20110208094016-7svkud5dzdf8a2uc
---
 addons/project_issue/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 59f67eda7e0..fbb56803b89 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "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_email_message_project_manager","email.message.manager","email.model_email_message","project.group_project_manager",1,1,1,1
+"access_email_message_project_manager","email.message.manager","emails.model_email_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_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0
+"access_email_message_issue_project_user","project.mailgate.message.issue.user","emails.model_email_message","project.group_project_user",1,1,1,0
-- 
cgit v1.2.3


From b086aadd1ea4a6163d927cb51ba51ef95ebc4aab Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 17:26:56 +0530
Subject: [IMP] project_issue :- call email.message.send.wizard in oprtunity
 instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218115656-off7dhkdo0n5sh71
---
 addons/project_issue/project_issue.py       | 32 +++++++++++++++++++++++++++++
 addons/project_issue/project_issue_view.xml | 27 ++++++++++++------------
 2 files changed, 45 insertions(+), 14 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9e82eb01556..227ba4f617d 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -243,6 +243,38 @@ class project_issue(crm.crm_case, osv.osv):
         'project_id':_get_project,
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 23a361b0ff9..c17002d969d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -101,11 +101,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                name="%(emails.action_email_message_wizard_send)d"
+		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -120,11 +120,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -141,10 +140,10 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'project.issue', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
-- 
cgit v1.2.3


From d1dcd5a16f5b716b6fe7f014cf028ec6b8c86c94 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 18:15:09 +0530
Subject: [IMP] remove duplicate code in crm, crm_claim. crm_helpdesk, event,
 hr_recruitment, project_issu relate to send mail wizard.and improve
 email.message.send wizard.

bzr revid: ysa@tinyerp.com-20110218124509-srcrk6lz4p4f3wlw
---
 addons/project_issue/project_issue.py       | 32 -----------------------------
 addons/project_issue/project_issue_view.xml |  6 +++---
 2 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 227ba4f617d..9e82eb01556 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -243,38 +243,6 @@ class project_issue(crm.crm_case, osv.osv):
         'project_id':_get_project,
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c17002d969d..a0bb2a82898 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -141,9 +141,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'project.issue', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object"/>
+		                        name="%(emails.action_email_message_wizard_send)d"
+		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
-- 
cgit v1.2.3


From ffe734015973d9c08943c947ab23d94815b144c0 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 18:18:46 +0530
Subject: [IMP] remove unused import statement.

bzr revid: ysa@tinyerp.com-20110218124846-uas68so40m2bvi4n
---
 addons/project_issue/project_issue.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9e82eb01556..dce28737bfd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,7 +27,6 @@ import binascii
 import time
 import tools
 
-
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
     _order = "name desc"
-- 
cgit v1.2.3


From 748860ca608ce957d8e8ef1d7d86feef47cf6b0f Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 15:24:01 +0530
Subject: [IMP] emails :- change emails.message.send wizard name to
 email.compose.message wizard and related changes in some module.

bzr revid: ysa@tinyerp.com-20110221095401-pl0pyhzr7h8w7mjl
---
 addons/project_issue/project_issue_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a0bb2a82898..4aed9f00d0e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -103,7 +103,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_message_wizard_send)d"
+		                                name="%(emails.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -121,7 +121,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -141,7 +141,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_message_wizard_send)d"
+		                        name="%(emails.action_email_compose_message_wizard)d"
 		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
-- 
cgit v1.2.3


From 99b8e78d0f3bd1bf4690b8a921349cef83c0af58 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 17:27:00 +0530
Subject: [IMP] integrate email.compose.message wizard with project_scrum
 module.

bzr revid: ysa@tinyerp.com-20110221115700-yiz0x5ypgu5v3rb1
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4aed9f00d0e..4a80b38fa04 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -104,7 +104,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'model': 'project.issue', 'project.issue' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
-- 
cgit v1.2.3


From 40db9a23788b20b15426f59de5f8b9df7d9aabaf Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Feb 2011 10:37:37 +0530
Subject: [IMP] email.compose.message :- improve context value in related
 module.

bzr revid: ysa@tinyerp.com-20110222050737-hq5uv88etuu06yow
---
 addons/project_issue/project_issue_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4a80b38fa04..f8f4f84964f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -104,7 +104,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'project.issue', 'project.issue' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -122,7 +122,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -142,7 +142,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
-- 
cgit v1.2.3


From ece864e5320043ac91f35853d8ae78b797ba16c4 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 24 Feb 2011 15:43:05 +0530
Subject: [IMP] email.compose.message :- add the email_model=model name pass in
 context in xml file and change the active_model to email_model in default_get
 method. Global list define of email_model in crm and module are install then
 add the model name in this list.

bzr revid: ysa@tinyerp.com-20110224101305-iagvga1j6o6h4k0k
---
 addons/project_issue/project_issue.py       | 3 +++
 addons/project_issue/project_issue_view.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index dce28737bfd..1c8bc327d6d 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -26,6 +26,9 @@ from tools.translate import _
 import binascii
 import time
 import tools
+from crm import wizard
+
+wizard.email_compose_message.email_model.append('project.issue')
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f8f4f84964f..0fb8c1f0ad3 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -142,7 +142,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new'}"
+		                        context="{'mail':'new', 'email_model':'project.issue'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
-- 
cgit v1.2.3


From d44239edd26e1b39f0277f617faf06e66901ce8c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 24 Feb 2011 17:28:01 +0530
Subject: [REM] remove unused value in context. like mail=new remove in context
 related to email.compose.message wizard.

bzr revid: ysa@tinyerp.com-20110224115801-wc1ka9ntxtvnwm4y
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0fb8c1f0ad3..2130d7fa8d5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -142,7 +142,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'email_model':'project.issue'}"
+		                        context="{'email_model':'project.issue'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
-- 
cgit v1.2.3


From e1afe5828aa5bc65a61ee6143a2dabd2fa6c0e33 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Mar 2011 13:09:00 +0530
Subject: [IMP] change module name emails to email and related to changes in
 addons all module. move email_gateway module file in email module and also
 related changes in related module..

bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
---
 addons/project_issue/project_issue_view.xml       | 6 +++---
 addons/project_issue/security/ir.model.access.csv | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 894025df71e..5d4cba851cc 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -103,7 +103,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_compose_message_wizard)d"
+		                                name="%(email.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -121,7 +121,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_compose_message_wizard)d"
+		                                            name="%(email.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -141,7 +141,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_compose_message_wizard)d"
+		                        name="%(email.action_email_compose_message_wizard)d"
 		                        context="{'email_model':'project.issue', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index fbb56803b89..59f67eda7e0 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "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_email_message_project_manager","email.message.manager","emails.model_email_message","project.group_project_manager",1,1,1,1
+"access_email_message_project_manager","email.message.manager","email.model_email_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_email_message_issue_project_user","project.mailgate.message.issue.user","emails.model_email_message","project.group_project_user",1,1,1,0
+"access_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0
-- 
cgit v1.2.3


From 455fb2d6b349df99449e1b8655349be8ce2869db Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 18 Mar 2011 19:14:19 +0530
Subject: [IMP] email: email cleanup

bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz
---
 addons/project_issue/project_issue.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 1c8bc327d6d..e4f9a379358 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -46,7 +46,7 @@ class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, id desc"
-    _inherit = ['mailgate.thread']
+    _inherit = ['email.thread']
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -374,7 +374,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
         if context is None:
             context = {}
-        mailgate_pool = self.pool.get('email.server.tools')
+        thread_pool = self.pool.get('email.thread')
 
         subject = msg.get('subject') or _('No Title')
         body = msg.get('body')
@@ -391,7 +391,7 @@ class project_issue(crm.crm_case, osv.osv):
         if msg.get('priority', False):
             vals['priority'] = priority
 
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
+        res = thread_pool.get_partner(cr, uid, msg.get('from'))
         if res:
             vals.update(res)
         context.update({'state_to' : 'draft'})
-- 
cgit v1.2.3


From 2fe7c51e361ade79eef9af67f11a96a5fc24b035 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 21 Mar 2011 19:01:56 +0530
Subject: [REM] email.smtp_server: removed email.smtp_server and did changes in
 email module

bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
---
 addons/project_issue/project_issue.py | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e4f9a379358..3349334041f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -455,18 +455,6 @@ class project_issue(crm.crm_case, osv.osv):
         res = self.write(cr, uid, ids, vals)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default:
-- 
cgit v1.2.3


From 24883b8c5719429a204b3661b2761d780124f1ce Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 25 Mar 2011 09:42:27 +0530
Subject: [IMP] crm,project_issue: did related changes

bzr revid: rha@tinyerp.com-20110325041227-ljpbuaf8gu03ak89
---
 addons/project_issue/project_issue_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 492a1ca9064..93df5636a87 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -113,13 +113,13 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                         <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
+                                                <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(email.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
-- 
cgit v1.2.3


From 47a85e9f8f0fadf16d679a2f1fdbef0ef1c59440 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 4 Apr 2011 15:15:52 +0530
Subject: [IMP] mail: rename module email to mail because of parsing error

bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
---
 addons/project_issue/project_issue_view.xml       |  6 +++---
 addons/project_issue/security/ir.model.access.csv | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 93df5636a87..5fed2baceed 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -103,7 +103,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(email.action_email_compose_message_wizard)d"
+		                                name="%(mail.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -121,7 +121,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="body" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(email.action_email_compose_message_wizard)d"
+		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -141,7 +141,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(email.action_email_compose_message_wizard)d"
+		                        name="%(mail.action_email_compose_message_wizard)d"
 		                        context="{'email_model':'project.issue', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 59f67eda7e0..3015a900f70 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
-"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
-"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
-"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_email_message_project_manager","email.message.manager","email.model_email_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_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0
+"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
+"access_project_issue_all";"project.issue";"model_project_issue";"project.group_project_manager";1;1;1;1
+"access_project_issue_user";"project.issue";"model_project_issue";"project.group_project_user";1;1;1;1
+"access_project_issue_report_all";"project.issue.report";"model_project_issue_report";"project.group_project_manager";1;1;1;1
+"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_email_message_project_manager";"email.message.manager";"mail.model_email_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_email_message_issue_project_user";"email.message..user";"mail.model_email_message";"project.group_project_user";1;1;1;0
-- 
cgit v1.2.3


From 63de8740bceb5f73471c9e1c1cb0f76400d8f7cd Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 5 Apr 2011 11:47:13 +0530
Subject: [FIX] csv file semicolon error

bzr revid: rha@tinyerp.com-20110405061713-b9qmkeqqg64er6lf
---
 addons/project_issue/security/ir.model.access.csv | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 3015a900f70..16ddc45f01a 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,11 +1,11 @@
-"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
-"access_project_issue_all";"project.issue";"model_project_issue";"project.group_project_manager";1;1;1;1
-"access_project_issue_user";"project.issue";"model_project_issue";"project.group_project_user";1;1;1;1
-"access_project_issue_report_all";"project.issue.report";"model_project_issue_report";"project.group_project_manager";1;1;1;1
-"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_email_message_project_manager";"email.message.manager";"mail.model_email_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_email_message_issue_project_user";"email.message..user";"mail.model_email_message";"project.group_project_user";1;1;1;0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
+"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
+"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
+"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_email_message_project_manager","email.message.manager","mail.model_email_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_email_message_issue_project_user","email.message.user","mail.model_email_message","project.group_project_user",1,1,1,0
-- 
cgit v1.2.3


From 5bebe7d2f18062b2bf455db1092aeb3bfc76e576 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 6 Apr 2011 13:17:01 +0530
Subject: [IMP] crm, email_thread.py: changes in message_new() arguments and
 improvements

bzr revid: rha@tinyerp.com-20110406074701-70vye5ey1sgg3b2v
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3349334041f..bfb359ceeef 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -412,7 +412,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         return res
 
-    def message_update(self, cr, uid, ids, vals=None, msg="", default_act='pending', context=None):
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-- 
cgit v1.2.3


From 4fe15ff183e883ad6f8f8dfe83213f3f34bfc67b Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 6 Apr 2011 16:46:47 +0530
Subject: [FIX] crm, crm_claim, crm_helpdesk, hr_recruitent, project_issue,
 project_mailgate: fix double attachment creation error as removing attachment
 from message_new()

bzr revid: rha@tinyerp.com-20110406111647-8xcyc2ershxj6q1a
---
 addons/project_issue/project_issue.py | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index bfb359ceeef..11e76f142a1 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -397,19 +397,6 @@ class project_issue(crm.crm_case, osv.osv):
         context.update({'state_to' : 'draft'})
         res = self.create(cr, uid, vals, context=context)
         self.convert_to_bug(cr, uid, [res], context=context)
-
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas': binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
-
         return res
 
     def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
-- 
cgit v1.2.3


From 0db9b58ef9522f098e177aff63b3af8b260c6f47 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Fri, 8 Apr 2011 16:40:01 +0530
Subject: [IMP] crm_helpdesk, project_issue, hr_recruitment, event,
 project_planning: inherited email.compose.message in these modules

bzr revid: rha@tinyerp.com-20110408111001-9om0nhd9c9irtwkc
---
 addons/project_issue/project_issue.py              |  2 -
 addons/project_issue/wizard/__init__.py            | 25 +++++++++++
 .../project_issue/wizard/email_compose_message.py  | 49 ++++++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 addons/project_issue/wizard/__init__.py
 create mode 100644 addons/project_issue/wizard/email_compose_message.py

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 11e76f142a1..1d30cfbd74b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -28,8 +28,6 @@ import time
 import tools
 from crm import wizard
 
-wizard.email_compose_message.email_model.append('project.issue')
-
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
     _order = "name desc"
diff --git a/addons/project_issue/wizard/__init__.py b/addons/project_issue/wizard/__init__.py
new file mode 100644
index 00000000000..51d4faa47d6
--- /dev/null
+++ b/addons/project_issue/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import email_compose_message
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
new file mode 100644
index 00000000000..655f04ad72a
--- /dev/null
+++ b/addons/project_issue/wizard/email_compose_message.py
@@ -0,0 +1,49 @@
+# -*- 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
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def get_value(self, cr, uid, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
+        if model == 'project.issue' and resource_id:
+            model_obj = self.pool.get(model)
+            data = model_obj.browse(cr, uid , resource_id, context)
+            result.update({
+                    'subject' : data.name or False,
+                    'email_to' : data.email_from or False,
+                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
+                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'email_cc' : tools.ustr(data.email_cc or ''),
+                    'model': model  or False,
+                    'res_id': resource_id  or False,
+                })
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From bc708c8b963be2540ba39e86e16d184c1158d0aa Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 12 Apr 2011 14:48:20 +0530
Subject: [REVIEW] remove passing email_model and email_res_id into context

bzr revid: hmo@tinyerp.com-20110412091820-t9wjrzetr814soeg
---
 addons/project_issue/project_issue_view.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5fed2baceed..86baa45b2f4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -142,7 +142,6 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(mail.action_email_compose_message_wizard)d"
-		                        context="{'email_model':'project.issue', 'email_res_id': active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
-- 
cgit v1.2.3


From 44bcca9f2f68f460438f1210002f52297c2bb001 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 19 Apr 2011 17:28:50 +0530
Subject: [IMP] email.compose.message: useability improvements

bzr revid: rha@tinyerp.com-20110419115850-8vsbd9yv3vhedgss
---
 addons/project_issue/wizard/email_compose_message.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
index 655f04ad72a..df1133245d2 100644
--- a/addons/project_issue/wizard/email_compose_message.py
+++ b/addons/project_issue/wizard/email_compose_message.py
@@ -27,6 +27,13 @@ class email_compose_message(osv.osv_memory):
     _inherit = 'email.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
+        '''
+        To get values of the resource_id for the model
+        @param model: Object
+        @param resource_id: id of a record for which values to be read
+
+        @return: Returns a dictionary
+        '''
         if context is None:
             context = {}
         result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
@@ -39,8 +46,8 @@ class email_compose_message(osv.osv_memory):
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
                     'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model  or False,
-                    'res_id': resource_id  or False,
+                    'model': model,
+                    'res_id': resource_id,
                 })
         return result
 
-- 
cgit v1.2.3


From 7ed0659f6e25f387f041f4d6f91cfb76459462cf Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 11:36:05 +0530
Subject: [IMP] mail: improvement for message_new() and related modules

bzr revid: rha@tinyerp.com-20110420060605-7q1z5917g1b7wapw
---
 addons/project_issue/project_issue.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 11e76f142a1..7d58bd77d36 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -395,9 +395,23 @@ class project_issue(crm.crm_case, osv.osv):
         if res:
             vals.update(res)
         context.update({'state_to' : 'draft'})
-        res = self.create(cr, uid, vals, context=context)
-        self.convert_to_bug(cr, uid, [res], context=context)
-        return res
+
+        res_id = self.create(cr, uid, vals, context)
+
+        attachments = msg.get('attachments', [])
+        self.history(cr, uid, [res_id], _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
+        self.convert_to_bug(cr, uid, [res_id], context=context)
+        return res_id
 
     def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
         """
-- 
cgit v1.2.3


From 280e446ceffeae725249a2687db203e9f97d8abe Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 11:56:46 +0530
Subject: [FIX]: attachment type as dictionary

bzr revid: rha@tinyerp.com-20110420062646-ngijwvt2395cihuw
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 7d58bd77d36..c8b55067fc5 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -398,7 +398,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         res_id = self.create(cr, uid, vals, context)
 
-        attachments = msg.get('attachments', [])
+        attachments = msg.get('attachments', {})
         self.history(cr, uid, [res_id], _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
-- 
cgit v1.2.3


From 190148f759d9134a2ecae103342cdba19cec5dec Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 20 Apr 2011 13:41:41 +0530
Subject: [FIX]: changes in message_update()

bzr revid: rha@tinyerp.com-20110420081141-4w1wi70e290m2a69
---
 addons/project_issue/project_issue.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index c8b55067fc5..e9e5521d94b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -454,6 +454,19 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
+
+        attachments = msg.get('attachments', {})
+        self.history(cr, uid, ids, _('receive'), history=True,
+                            subject = msg.get('subject'),
+                            email = msg.get('to'),
+                            details = msg.get('body'),
+                            email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
+                            message_id = msg.get('message-id'),
+                            references = msg.get('references', False) or msg.get('in-reply-to', False),
+                            attach = attachments,
+                            email_date = msg.get('date'),
+                            context = context)
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
-- 
cgit v1.2.3


From 4b2f93cb343874fb828a62694a09a858f7cc45c0 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 21 Apr 2011 14:49:15 +0530
Subject: [FIX]: removed method _history() and called history() instead

bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e9e5521d94b..a88ee17496e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -361,7 +361,7 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
-        self._history(cr, uid, cases, _('Escalate'))
+        self.history(cr, uid, cases, _('Escalate'))
         return True
 
     def message_new(self, cr, uid, msg, context=None):
-- 
cgit v1.2.3


From 96a33521da4a5a01440a31b95ec34aba3394999b Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Mon, 2 May 2011 12:28:49 +0530
Subject: [IMP]
 crm,crm_claim,crm_helpdesk,hr_recruitment,project_issue,project_mailgate:
 improvement in message_new()

bzr revid: rha@tinyerp.com-20110502065849-19nilmvniw28n8ts
---
 addons/project_issue/project_issue.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5bbd94c5a34..39c15bf85ca 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -420,6 +420,10 @@ class project_issue(crm.crm_case, osv.osv):
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
                             attach = attachments,
                             email_date = msg.get('date'),
+                            body_html= msg.get('body_html'),
+                            sub_type = msg.get('sub_type'),
+                            headers = msg.get('headers'),
+                            priority = msg.get('priority', False),
                             context = context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
-- 
cgit v1.2.3


From 3a904e407b6b1a7122bac98470e3b9330926ffab Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 3 May 2011 12:08:44 +0530
Subject: [IMP] mail: able to retrive priority of an email message and related
 changes in message_new() and message_update()

bzr revid: rha@tinyerp.com-20110503063844-yhlhlnpvciveh219
---
 addons/project_issue/project_issue.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 39c15bf85ca..def289ecc0f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -423,7 +423,7 @@ class project_issue(crm.crm_case, osv.osv):
                             body_html= msg.get('body_html'),
                             sub_type = msg.get('sub_type'),
                             headers = msg.get('headers'),
-                            priority = msg.get('priority', False),
+                            priority = msg.get('priority'),
                             context = context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
@@ -481,6 +481,10 @@ class project_issue(crm.crm_case, osv.osv):
                             references = msg.get('references', False) or msg.get('in-reply-to', False),
                             attach = attachments,
                             email_date = msg.get('date'),
+                            body_html= msg.get('body_html'),
+                            sub_type = msg.get('sub_type'),
+                            headers = msg.get('headers'),
+                            priority = msg.get('priority'),
                             context = context)
         return res
 
-- 
cgit v1.2.3


From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Aug 2011 19:16:59 +0200
Subject: [IMP] all: next pass of review/renaming for new mail API

bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
---
 addons/project_issue/project_issue.py              | 67 +++++-----------------
 addons/project_issue/project_issue_view.xml        | 10 ++--
 .../project_issue/report/project_issue_report.py   |  2 +-
 .../project_issue/wizard/email_compose_message.py  |  5 +-
 4 files changed, 20 insertions(+), 64 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 484802f8638..d799d60d5db 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -44,7 +44,7 @@ class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['email.thread']
+    _inherit = ['mail.thread']
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -383,20 +383,14 @@ class project_issue(crm.crm_case, osv.osv):
         self.history(cr, uid, cases, _('Escalate'))
         return True
 
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
         if context is None:
             context = {}
-        thread_pool = self.pool.get('email.thread')
+        thread_pool = self.pool.get('mail.thread')
 
         subject = msg.get('subject') or _('No Title')
-        body = msg.get('body')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
 
@@ -407,7 +401,7 @@ class project_issue(crm.crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
 
         res = thread_pool.get_partner(cr, uid, msg.get('from'))
@@ -415,34 +409,15 @@ class project_issue(crm.crm_case, osv.osv):
             vals.update(res)
         context.update({'state_to' : 'draft'})
 
-        res_id = self.create(cr, uid, vals, context)
+        if custom_values and isinstance(custom_values, dict):
+            vals.update(custom_values)
 
-        attachments = msg.get('attachments', {})
-        self.history(cr, uid, [res_id], _('receive'), history=True,
-                            subject = msg.get('subject'),
-                            email = msg.get('to'),
-                            details = msg.get('body'),
-                            email_from = msg.get('from'),
-                            email_cc = msg.get('cc'),
-                            message_id = msg.get('message-id'),
-                            references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = attachments,
-                            email_date = msg.get('date'),
-                            body_html= msg.get('body_html'),
-                            sub_type = msg.get('sub_type'),
-                            headers = msg.get('headers'),
-                            priority = msg.get('priority'),
-                            context = context)
+        res_id = self.create(cr, uid, vals, context)
+        self.append_mail(cr, uid, [res_id], msg, context=context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs
-        """
 
         if vals is None:
             vals = {}
@@ -451,7 +426,7 @@ class project_issue(crm.crm_case, osv.osv):
             ids = [ids]
 
         vals.update({
-            'description': msg['body']
+            'description': msg['body_text']
         })
         if msg.get('priority', False):
             vals['priority'] = msg.get('priority')
@@ -468,7 +443,7 @@ class project_issue(crm.crm_case, osv.osv):
                 record.write({'state' : 'open'})
 
         vls = { }
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -477,23 +452,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
-
-        attachments = msg.get('attachments', {})
-        self.history(cr, uid, ids, _('receive'), history=True,
-                            subject = msg.get('subject'),
-                            email = msg.get('to'),
-                            details = msg.get('body'),
-                            email_from = msg.get('from'),
-                            email_cc = msg.get('cc'),
-                            message_id = msg.get('message-id'),
-                            references = msg.get('references', False) or msg.get('in-reply-to', False),
-                            attach = attachments,
-                            email_date = msg.get('date'),
-                            body_html= msg.get('body_html'),
-                            sub_type = msg.get('sub_type'),
-                            headers = msg.get('headers'),
-                            priority = msg.get('priority'),
-                            context = context)
+        self.append_mail(cr, uid, [res_id], msg, context=context)
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b60fd4f0c6b..ffe5110e6a9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -100,9 +100,8 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
 		                            <button
-		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
 		                                name="%(mail.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
@@ -114,18 +113,17 @@
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
                                         <field name="subject" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="body" colspan="4" nolabel="1" height="250"/>
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 6b56a254a4a..a199d1c9d57 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -102,7 +102,7 @@ class project_issue_report(osv.osv):
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
                     extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM email_message WHERE model='project.issue' AND res_id=c.id) AS email
+                    (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email
 
                 FROM
                     project_issue c
diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
index df1133245d2..ffb708ebe35 100644
--- a/addons/project_issue/wizard/email_compose_message.py
+++ b/addons/project_issue/wizard/email_compose_message.py
@@ -24,7 +24,7 @@ from osv import fields
 import tools
 
 class email_compose_message(osv.osv_memory):
-    _inherit = 'email.compose.message'
+    _inherit = 'mail.compose.message'
 
     def get_value(self, cr, uid, model, resource_id, context=None):
         '''
@@ -44,13 +44,12 @@ class email_compose_message(osv.osv_memory):
                     'subject' : data.name or False,
                     'email_to' : data.email_from or False,
                     'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
-                    'body' : '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'body_text' : '\n' + (tools.ustr(data.user_id.signature or '')),
                     'email_cc' : tools.ustr(data.email_cc or ''),
                     'model': model,
                     'res_id': resource_id,
                 })
         return result
 
-email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 2f543db06e952991577ca659f6b9b4dfc57cf828 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 25 Aug 2011 14:27:57 +0200
Subject: [IMP] mail: cleanup/rename API + adapt dependencies (wip)

bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
---
 addons/project_issue/project_issue.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 4d4633a4c79..1524a14e880 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -388,20 +388,17 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
-        self.history(cr, uid, cases, _('Escalate'))
+        self.message_append(cr, uid, cases, _('Escalate'))
         return True
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """Automatically called when new email message arrives"""
         if context is None:
             context = {}
-        thread_pool = self.pool.get('mail.thread')
-
         subject = msg.get('subject') or _('No Title')
         body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -411,17 +408,14 @@ class project_issue(crm.crm_case, osv.osv):
         }
         if priority:
             vals['priority'] = priority
-
-        res = thread_pool.get_partner(cr, uid, msg.get('from'))
-        if res:
-            vals.update(res)
+        vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
         context.update({'state_to' : 'draft'})
 
         if custom_values and isinstance(custom_values, dict):
             vals.update(custom_values)
 
         res_id = self.create(cr, uid, vals, context)
-        self.append_mail(cr, uid, [res_id], msg, context=context)
+        self.message_append_dict(cr, uid, [res_id], msg, context=context)
         self.convert_to_bug(cr, uid, [res_id], context=context)
         return res_id
 
@@ -460,7 +454,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
-        self.append_mail(cr, uid, [res_id], msg, context=context)
+        self.message_append_dict(cr, uid, [res_id], msg, context=context)
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
-- 
cgit v1.2.3


From 1db8e54425bd72477d67e77c62a160b405370f09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 6 Sep 2011 11:32:28 +0200
Subject: [IMP] all: unified context params for mail composition wizard

A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.

bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
---
 addons/project_issue/project_issue_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 616435614fd..d690edef39b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -103,7 +103,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
 		                                name="%(mail.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'message_id':active_id}"
+		                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -120,7 +120,7 @@
                                                 <field name="body_text" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(mail.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'message_id':active_id}"
+		                                            context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('email_from', '!=', False)]}">
-- 
cgit v1.2.3


From 90621d90b4656363351bfe2af0b753ce6b383a54 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Sep 2011 21:27:35 +0200
Subject: [FIX] project*: fix mail.message model name in access rights

bzr revid: odo@openerp.com-20110907192735-yn09uo9z2wif241n
---
 addons/project_issue/security/ir.model.access.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 16ddc45f01a..01afcb73b09 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "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_email_message_project_manager","email.message.manager","mail.model_email_message","project.group_project_manager",1,1,1,1
+"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_email_message_issue_project_user","email.message.user","mail.model_email_message","project.group_project_user",1,1,1,0
+"access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0
-- 
cgit v1.2.3


From fbbbe76d00961944f629f45be235bc535d1cf0d6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Sep 2011 23:15:47 +0200
Subject: [IMP] project.issue: simplified mail composition wizard

bzr revid: odo@openerp.com-20110907211547-nzcjbqpkw7kmx1zc
---
 addons/project_issue/__init__.py                   |  1 -
 addons/project_issue/project_issue.py              |  4 +-
 addons/project_issue/wizard/__init__.py            | 25 ----------
 .../project_issue/wizard/email_compose_message.py  | 55 ----------------------
 4 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 addons/project_issue/wizard/__init__.py
 delete mode 100644 addons/project_issue/wizard/email_compose_message.py

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
index 21efa34f6f4..f519698a60c 100644
--- a/addons/project_issue/__init__.py
+++ b/addons/project_issue/__init__.py
@@ -22,6 +22,5 @@
 
 import project_issue
 import report
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b8585ab4f01..bbbead95c19 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -28,6 +28,8 @@ import time
 import tools
 from crm import wizard
 
+wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue')
+
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
     _order = "name desc"
@@ -404,7 +406,7 @@ class project_issue(crm.crm_case, osv.osv):
         }
         if priority:
             vals['priority'] = priority
-        vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
+        vals.update(self.message_partner_by_email(cr, uid, msg_from))
         context.update({'state_to' : 'draft'})
 
         if custom_values and isinstance(custom_values, dict):
diff --git a/addons/project_issue/wizard/__init__.py b/addons/project_issue/wizard/__init__.py
deleted file mode 100644
index 51d4faa47d6..00000000000
--- a/addons/project_issue/wizard/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import email_compose_message
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/wizard/email_compose_message.py b/addons/project_issue/wizard/email_compose_message.py
deleted file mode 100644
index ffb708ebe35..00000000000
--- a/addons/project_issue/wizard/email_compose_message.py
+++ /dev/null
@@ -1,55 +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
-
-class email_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        if context is None:
-            context = {}
-        result = super(email_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'project.issue' and resource_id:
-            model_obj = self.pool.get(model)
-            data = model_obj.browse(cr, uid , resource_id, context)
-            result.update({
-                    'subject' : data.name or False,
-                    'email_to' : data.email_from or False,
-                    'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False,
-                    'body_text' : '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model,
-                    'res_id': resource_id,
-                })
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 194c8dba3198010e54f55c4851177827d942c6ce Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Sep 2011 23:17:36 +0200
Subject: [FIX] mail*: mail.message list should be readonly

bzr revid: odo@openerp.com-20110907211736-73fnu73xnca14gn9
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d690edef39b..0d02b93195e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -97,7 +97,7 @@
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
 		                            <button
-- 
cgit v1.2.3


From 898108de880227ad006b4c097444aa026f4e2f4d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 03:06:17 +0200
Subject: [FIX] project.issue: typo

bzr revid: odo@openerp.com-20110908010617-sjy3xnkw2o8uqgjm
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index bbbead95c19..8237159af7a 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -452,7 +452,7 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
-        self.message_append_dict(cr, uid, [res_id], msg, context=context)
+        self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
-- 
cgit v1.2.3


From f0d937e96d4b7c65a601f23ae8ff690cb9370f8e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 9 Sep 2011 16:18:44 +0200
Subject: [FIX] mail*: add missing `email_from` field for list views that need
 it for attrs

bzr revid: odo@openerp.com-20110909141844-b9vnj0p0tin534uu
---
 addons/project_issue/project_issue_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/project_issue')

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0d02b93195e..0bf171d6aeb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -100,6 +100,7 @@
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
+                                    <field name="email_from" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
 		                                name="%(mail.action_email_compose_message_wizard)d"
-- 
cgit v1.2.3