[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty

diff --cc addons/edi/controllers/main.py
index 14cd97b,a176cb4..10bf214
--- 1/addons/edi/controllers/main.py
--- 2/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@@ -23,9 -75,12 +23,10 @@@ class EDI(openerpweb.Controller)
  
      @openerpweb.jsonrequest
      def import_edi_url(self, req, url):
+         context = req.session.eval_context(req.context)
          result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
          if len(result) == 1:
-             return {"action": webmain.clean_action(req, result[0][2])}
+             return {"action": webmain.clean_action(req, result[0][2], context)}
          return True
  
 -#
 -
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/mail/tests/test_mail.py
Simple merge

diff --cc addons/mail/tests/test_mail_access_rights.py
index b8febc2,7594de8..1b2f7f8
--- 1/addons/mail/tests/test_mail_access_rights.py
--- 2/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@@ -20,8 -20,8 +20,8 @@@
  ##############################################################################
  
  from openerp.addons.mail.tests import test_mail_mockup
- from osv.orm import except_orm
+ from openerp.osv.orm import except_orm
 -from openerp.tools.misc import mute_logger
 +from openerp.tools import mute_logger
  
  
  class test_mail_access_rights(test_mail_mockup.TestMailMockups):

diff --cc addons/mail/wizard/mail_compose_message.py
index 8efc4cf,c409d4a..58066c6
--- 1/addons/mail/wizard/mail_compose_message.py
--- 2/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@@ -102,9 -102,14 +102,10 @@@ class mail_compose_message(osv.Transien
          'partner_ids': fields.many2many('res.partner',
              'mail_compose_message_res_partner_rel',
              'wizard_id', 'partner_id', 'Additional contacts'),
-         'attachment_ids': fields.many2many('ir.attachment', 'mail_compose_message_ir_attachments_rel',
-             'wizard_id', 'attachment_id', string='Attachments'),
+         'attachment_ids': fields.many2many('ir.attachment',
+             'mail_compose_message_ir_attachments_rel',
+             'wizard_id', 'attachment_id', 'Attachments'),
          'filter_id': fields.many2one('ir.filters', 'Filters'),
 -        'body_text': fields.text('Plain-text Contents'),
 -        'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
 -            help="Type of message, usually 'html' or 'plain', used to select "\
 -                  "plain-text or rich-text contents accordingly"),
      }
  
      _defaults = {