Merge lp:~openerp-dev/openobject-addons/6.1-opw-577014-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX] email_template: sending mail from the template Sidebar action button shows expression value not the original values.

Steps to reproduce:
1. Create a template as Issue Template on the model "project.issue" and provide the email details as "${object.partner_address_id.email}" in the To/From/CC/BCC field.
2. Create a Side bar action button on the template.
3. Open Issue form and create an issue and Try to send email from the created Side bar action button.
Current Behavior:
  Wizard shows the expression values as "${object.partner_address_id.email}"
Expected Behavior:
  Wizard should shows actual email address ex:"<email address hidden>".

This branch fixes this issue.

Thanks,
Somesh Khare

[Vinay Rana (OpenERP) (vra-openerp)]

The provided fix is perfect.As per my test cases this is working.

review: Approve

[Vinay Rana (OpenERP) (vra-openerp)]

One more thing I want to include this issue as I found one problem with mass mailing part where we needed expression instead of rendered value. This require expression part so I think this fix will create a another problem while doing from list view action and calling the wizard for multiple ids.

As I think, this can be propose solution for covering both the point when we calls a wizard from tree and form view:
1) If the action is called from tree view the value should not be rendered, If this is calling from form view the value should be replaced.

review: Needs Fixing

[Somesh Khare (somesh.khare)]

Hello Sir,

I have changed the code as per as your above suggession. The value of expression will render only when single record is selected either from the form view or list view. In case multiple ids selection (list view) the values will not render only expression will be there.

Kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

review: Needs Resubmitting

[Naresh(OpenERP) (nch-openerp)]

 This MP clashes with https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-576491-rgo/+merge/113912

=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py	2012-04-12 12:34:50 +0000
+++ email_template/wizard/mail_compose_message.py	2012-08-20 08:00:59 +0000
@@ -82,7 +82,10 @@
         values = {}
         if template_id:
             res_id = context.get('mail.compose.target.id') or context.get('active_id') or False
-            if context.get('mail.compose.message.mode') == 'mass_mail':
+            # when composing message interactivly, do not use mass_mail mode if user are working
+            # on a unique resource (ex: when composing message from a form view)
+            working_on_multi_resources = len(context.get('active_ids') or []) > 1 and True or False
+            if context.get('mail.compose.message.mode') == 'mass_mail' and working_on_multi_resources:
                 # use the original template values - to be rendered when actually sent
                 # by super.send_mail()
                 values = self.pool.get('email.template').read(cr, uid, template_id, self.fields_get_keys(cr, uid), context)