From d63731b65f7367f83ef4b18a1772b2b25363a11b Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 17:24:45 +0530
Subject: [PATCH 1/3] [IMP]: email_template: *able to save email as new
 template to reuse it *evaluating expression type for mail same as
 email_template

bzr revid: rha@tinyerp.com-20110426115445-qpx91w218tyg4jde
---
 addons/email_template/email_template.py       |  4 ---
 .../wizard/email_compose_message.py           | 27 +++++++++++++++++++
 .../wizard/email_compose_message_view.xml     | 11 +++++---
 addons/mail/wizard/email_compose_message.py   |  4 +--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 192a42314a8..0f35a066f3c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -152,10 +152,6 @@ class email_template(osv.osv):
         'body_html': fields.text('HTML', help="Contains HTML version of email. Placeholders can be used here."),
     }
 
-    _sql_constraints = [
-        ('name', 'unique (name)','The template name must be unique !')
-    ]
-
     def create_action(self, cr, uid, ids, context=None):
         vals = {}
         if context is None:
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 41cbd9fa146..1a566830779 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -79,6 +79,33 @@ class email_compose_message(osv.osv_memory):
             values['attachment_ids'] = att_ids
         return {'value': values}
 
+    def save_as_new_template(self, cr, uid, ids, context=None):
+        '''
+        create a new template record
+        '''
+        if context is None:
+            context = {}
+        template_pool = self.pool.get('email.template')
+        model_pool = self.pool.get('ir.model')
+        for record in self.browse(cr, uid, ids, context=context):
+            model = model_pool.search(cr, uid, [('name','=', record.model)])[0]
+            values = {
+                'name': record.model,
+                'email_from': record.email_from or False,
+                'subject': record.subject or False,
+                'body': record.body or False,
+                'email_to': record.email_to or False,
+                'email_cc': record.email_cc or False,
+                'email_bcc': record.email_bcc or False,
+                'reply_to': record.reply_to or False,
+                'auto_delete': record.auto_delete,
+                'model_id': model or False,
+                'smtp_server_id': record.smtp_server_id.id or False,
+                'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
+            }
+            template_pool.create(cr, uid, values, context=context)
+        return True
+
 email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index a2776662e0d..8c229176c13 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -8,10 +8,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
-	            <field name="model" position="after">
-	                <field name="template_id" colspan="4"
+	            <data>
+		            <xpath expr="//field[@name='model']" position="after">
+		                <field name="template_id" colspan="4"
 	                    on_change="on_change_template(template_id, context)"/>
-	            </field>
+		            </xpath>
+		            <xpath expr="//button[@string='Close']" position="after">
+		                <button icon="" type="object" name="save_as_new_template" string="Save As New Template"/>
+		            </xpath>
+	            </data>
             </field>
         </record>
 	</data>
diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py
index efa87f6a108..232f10e6a1f 100644
--- a/addons/mail/wizard/email_compose_message.py
+++ b/addons/mail/wizard/email_compose_message.py
@@ -225,7 +225,7 @@ class email_compose_message(osv.osv_memory):
         if context is None:
             context = {}
         def merge(match):
-            exp = str(match.group()[2:-2]).strip()
+            exp = str(match.group()[2:-1]).strip()
             result = eval(exp,
                           {
                             'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
@@ -236,7 +236,7 @@ class email_compose_message(osv.osv_memory):
                 return str("--------")
             return tools.ustr(result)
 
-        com = re.compile('(\[\[.+?\]\])')
+        com = re.compile('(\$\{.+?\})')
         return message and com.sub(merge, message)
 
 email_compose_message()

From f7883303b4876549660e4a2775b642d302bedcc2 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 17:50:54 +0530
Subject: [PATCH 2/3] [FIX] email_template: added icon for button 'Save As
 Template' and change string and changes in search method domain for
 save_as_template()

bzr revid: rha@tinyerp.com-20110426122054-p4jcrk9zzt97dp8i
---
 addons/email_template/wizard/email_compose_message.py       | 4 ++--
 addons/email_template/wizard/email_compose_message_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index 1a566830779..e602d534e48 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -79,7 +79,7 @@ class email_compose_message(osv.osv_memory):
             values['attachment_ids'] = att_ids
         return {'value': values}
 
-    def save_as_new_template(self, cr, uid, ids, context=None):
+    def save_as_template(self, cr, uid, ids, context=None):
         '''
         create a new template record
         '''
@@ -88,7 +88,7 @@ class email_compose_message(osv.osv_memory):
         template_pool = self.pool.get('email.template')
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = model_pool.search(cr, uid, [('name','=', record.model)])[0]
+            model = model_pool.search(cr, uid, [('model','=', record.model)])[0]
             values = {
                 'name': record.model,
                 'email_from': record.email_from or False,
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 8c229176c13..22a8191541a 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -14,7 +14,7 @@
 	                    on_change="on_change_template(template_id, context)"/>
 		            </xpath>
 		            <xpath expr="//button[@string='Close']" position="after">
-		                <button icon="" type="object" name="save_as_new_template" string="Save As New Template"/>
+		                <button icon="gtk-new" type="object" name="save_as_template" string="Save As Template"/>
 		            </xpath>
 	            </data>
             </field>

From 855b512e74a0618eacce42cbf339cc0f4e56c8dd Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 26 Apr 2011 18:08:24 +0530
Subject: [PATCH 3/3] [FIX]

bzr revid: rha@tinyerp.com-20110426123824-l49480b3bkm0mr2k
---
 addons/email_template/wizard/email_compose_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index e602d534e48..d5289a4e98f 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -89,8 +89,9 @@ class email_compose_message(osv.osv_memory):
         model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
             model = model_pool.search(cr, uid, [('model','=', record.model)])[0]
+            model_name = model_pool.browse(cr, uid, model, context=context).name
             values = {
-                'name': record.model,
+                'name': model_name,
                 'email_from': record.email_from or False,
                 'subject': record.subject or False,
                 'body': record.body or False,