[MERGE] OPW 576491: edi + email_template: correctly generate edi_web_view_url when...

 * edi: improve generation/usage of edi_web_url_view for template rendering

   - wrap edi_web_url_view generation to _edi_get_object_web_url_view() method.
   - automatically add 'edi_web_url_view' to all email.template rendering context

   - introduce LazyEdiWebUrlViewGetter class, to allow resolving record wihtin
     template rendering context - only when necessary. This to prevent generating
     unrequested edi_web_url_view links

 * mail & email_template: allow to modify render_template context

   - add _prepare_render_template_context() method to allow modifying context
     before rendering template.

bzr revid: xal@openerp.com-20120820155601-appnnpp4p3a803nz

diff --cc addons/email_template/wizard/mail_compose_message.py
Simple merge