From d758de88f06fe58b64bcf262757d32e7c4b70fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Jul 2013 11:33:35 +0200
Subject: [PATCH] [IMP] email_template: server action: better management of
 template fields, saved but not editable

bzr revid: tde@openerp.com-20130726093335-vxniwn121djpaw32
---
 addons/email_template/ir_actions.py       | 24 ++++++++++++++++++-----
 addons/email_template/ir_actions_view.xml | 10 +++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/addons/email_template/ir_actions.py b/addons/email_template/ir_actions.py
index 181cc9a1c5b..bd860785da4 100644
--- a/addons/email_template/ir_actions.py
+++ b/addons/email_template/ir_actions.py
@@ -33,16 +33,16 @@ class actions_server(osv.Model):
         return res
 
     _columns = {
-        'email_from': fields.char('From', readonly=True,
+        'email_from': fields.char('From',
                                   help="Sender address; define the template to see its value. If not set, the default "
                                   "value will be the author's email alias if configured, or email address."),
-        'email_to': fields.char('To (Emails)', readonly=True,
+        'email_to': fields.char('To (Emails)',
                                 help="Comma-separated recipient addresses; define the template to see its value"),
-        'partner_to': fields.char('To (Partners)', readonly=True,
+        'partner_to': fields.char('To (Partners)',
                                   help="Comma-separated ids of recipient partners; define the template to see its value"),
-        'subject': fields.char('Subject', readonly=True,
+        'subject': fields.char('Subject',
                                help="Email subject; define the template to see its value"),
-        'body_html': fields.text('Body', readonly=True,
+        'body_html': fields.text('Body',
                                  help="Rich-text/HTML version of the message; define the template to see its value"),
         'template_id': fields.many2one('email.template', 'Email Template', ondelete='set null',
                                        help="Define the email template to use for the email to send.")
@@ -61,6 +61,20 @@ class actions_server(osv.Model):
 
         return {'value': values}
 
+    def create(self, cr, uid, values, context=None):
+        if values.get('template_id'):
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to', 'attachment_ids']
+            template_values = self.pool.get('email.template').read(cr, uid, values.get('template_id'), fields, context)
+            values.update(dict((field, template_values[field]) for field in fields if template_values.get(field)))
+        return super(actions_server, self).create(cr, uid, values, context=context)
+
+    def write(self, cr, uid, ids, values, context=None):
+        if values.get('template_id'):
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to', 'attachment_ids']
+            template_values = self.pool.get('email.template').read(cr, uid, values.get('template_id'), fields, context)
+            values.update(dict((field, template_values[field]) for field in fields if template_values.get(field)))
+        return super(actions_server, self).write(cr, uid, ids, values, context=context)
+
     def run_action_email(self, cr, uid, action, eval_context=None, context=None):
         if not action.template_id or not context.get('active_id'):
             return False
diff --git a/addons/email_template/ir_actions_view.xml b/addons/email_template/ir_actions_view.xml
index c8a54997089..fae9c364312 100644
--- a/addons/email_template/ir_actions_view.xml
+++ b/addons/email_template/ir_actions_view.xml
@@ -29,16 +29,16 @@
                         <group attrs="{'invisible': ['|', ('model_id', '=', False), ('template_id', '=', False)]}">
                             <label for="email_from"/>
                             <div>
-                                <field name="email_from" nolabel="1'"
+                                <field name="email_from" nolabel="1'" readonly="1"
                                         attrs="{'required': [('state', '=', 'email')]}"/>
                                 <p attrs="{'invisible': [('email_from', '!=', False)]}">
                                     Your template does not defined any email_from. Please update your template.
                                 </p>
                             </div>
-                            <field name="email_to"/>
-                            <field name="partner_to"/>
-                            <field name="subject" attrs="{'required': [('state', '=', 'email')]}"/>
-                            <field name="body_html" attrs="{'required': [('state', '=', 'email')]}"/>
+                            <field name="email_to" readonly="1"/>
+                            <field name="partner_to" readonly="1"/>
+                            <field name="subject" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
+                            <field name="body_html" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
                         </group>
                     </page>
                 </xpath>