[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk

3 files changed, 80 insertions, 92 deletions

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 8f4833c294f..8085d301364 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -64,7 +64,7 @@ The main features are:
         'mail_data.xml',
     ],
     'installable': True,
-    'active': False,
+    'auto_install': False,
     'certificate': '001056784984222247309',
     'images': ['images/customer_history.jpeg','images/messages_form.jpeg','images/messages_list.jpeg'],
 }
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 82db735309b..0ec14b9cbb8 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -1,23 +1,42 @@
+# #-#-#-#-#  mail.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mail
+# 	* mail
 #
+# #-#-#-#-#  mail.pot.web (PROJECT VERSION)  #-#-#-#-#
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1beta\n"
+"#-#-#-#-#  mail.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
+"Project-Id-Version: OpenERP Server 6.1rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 18:45+0000\n"
-"PO-Revision-Date: 2011-12-22 18:45+0000\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-08 00:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
+"#-#-#-#-#  mail.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 
 #. module: mail
-#: field:mail.compose.message,subtype:0
-#: field:mail.message,subtype:0
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message type"
 msgstr ""
@@ -59,8 +78,7 @@ msgid "Compose Email"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,body_text:0
-#: help:mail.message,body_text:0
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
 msgstr ""
@@ -71,22 +89,19 @@ msgid "Body"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,email_to:0
-#: help:mail.message,email_to:0
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,body_text:0
-#: field:mail.message,body_text:0
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text contents"
 msgstr ""
 
 #. module: mail
-#: view:mail.message:0
-#: selection:mail.message,state:0
+#: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
 msgstr ""
 
@@ -106,54 +121,47 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,reply_to:0
-#: field:mail.message,reply_to:0
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,body_html:0
-#: help:mail.message,body_html:0
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,auto_delete:0
-#: field:mail.message,auto_delete:0
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,email_bcc:0
-#: help:mail.message,email_bcc:0
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_res_partner
-#: view:mail.message:0
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,subject:0
-#: field:mail.message,subject:0
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
 #: field:mail.message.common,subject:0
 msgid "Subject"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:151
+#: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,email_from:0
-#: field:mail.message,email_from:0
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
 #: field:mail.message.common,email_from:0
 msgid "From"
 msgstr ""
@@ -174,8 +182,7 @@ msgid "Failed"
 msgstr ""
 
 #. module: mail
-#: view:mail.message:0
-#: field:mail.message,state:0
+#: view:mail.message:0 field:mail.message,state:0
 msgid "State"
 msgstr ""
 
@@ -185,16 +192,16 @@ msgid "Reply"
 msgstr ""
 
 #. module: mail
-#: view:mail.message:0
-#: selection:mail.message,state:0
+#: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,subtype:0
-#: help:mail.message,subtype:0
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
 #: help:mail.message.common,subtype:0
-msgid "Type of message, usually 'html' or 'plain', used to select plaintext or rich text contents accordingly"
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
 msgstr ""
 
 #. module: mail
@@ -208,8 +215,7 @@ msgid "E-mail composition wizard"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,res_id:0
-#: field:mail.message,res_id:0
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
 msgstr ""
@@ -220,14 +226,13 @@ msgid "Advanced"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:156
+#: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,model:0
-#: field:mail.message,model:0
+#: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document model"
 msgstr ""
@@ -258,8 +263,7 @@ msgid "Retry"
 msgstr ""
 
 #. module: mail
-#: view:mail.message:0
-#: selection:mail.message,state:0
+#: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
 msgstr ""
 
@@ -279,8 +283,7 @@ msgid "User"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,date:0
-#: field:mail.message,date:0
+#: field:mail.compose.message,date:0 field:mail.message,date:0
 #: field:mail.message.common,date:0
 msgid "Date"
 msgstr ""
@@ -291,14 +294,13 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:152
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,body_html:0
-#: field:mail.message,body_html:0
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text contents"
 msgstr ""
@@ -309,30 +311,25 @@ msgid "Original"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/mail_thread.py:247
-#: view:res.partner:0
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
 msgstr ""
 
 #. module: mail
-#: view:mail.compose.message:0
-#: field:mail.compose.message,attachment_ids:0
-#: view:mail.message:0
-#: field:mail.message,attachment_ids:0
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,email_cc:0
-#: field:mail.message,email_cc:0
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
 #: field:mail.message.common,email_cc:0
 msgid "Cc"
 msgstr ""
@@ -349,8 +346,7 @@ msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,references:0
-#: field:mail.message,references:0
+#: field:mail.compose.message,references:0 field:mail.message,references:0
 #: field:mail.message.common,references:0
 msgid "References"
 msgstr ""
@@ -361,8 +357,7 @@ msgid "Display Text"
 msgstr ""
 
 #. module: mail
-#: view:mail.compose.message:0
-#: view:mail.message:0
+#: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
 msgstr ""
 
@@ -383,10 +378,11 @@ msgid "Related user"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,headers:0
-#: help:mail.message,headers:0
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
 #: help:mail.message.common,headers:0
-msgid "Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
 msgstr ""
 
 #. module: mail
@@ -395,8 +391,7 @@ msgid "Creation Month"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,email_to:0
-#: field:mail.message,email_to:0
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
 #: field:mail.message.common,email_to:0
 msgid "To"
 msgstr ""
@@ -413,10 +408,11 @@ msgid "Email Threads"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,email_from:0
-#: help:mail.message,email_from:0
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
 #: help:mail.message.common,email_from:0
-msgid "Message sender, taken from user preferences. If empty, this is not a mail but a message."
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
 msgstr ""
 
 #. module: mail
@@ -425,14 +421,13 @@ msgid "Body (Plain)"
 msgstr ""
 
 #. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:152
+#: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,message_id:0
-#: help:mail.message,message_id:0
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
 msgstr ""
@@ -445,15 +440,15 @@ msgstr ""
 #. module: mail
 #: code:addons/mail/mail_message.py:155
 #, python-format
-msgid "%s wrote on %s: \n"
+msgid ""
+"%s wrote on %s: \n"
 " Subject: %s \n"
-"	"
+"\t"
 msgstr ""
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
-#: view:mail.message:0
-#: field:res.partner,emails:0
+#: view:mail.message:0 field:res.partner,emails:0
 msgid "Emails"
 msgstr ""
 
@@ -465,15 +460,13 @@ msgid "Messages"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,headers:0
-#: field:mail.message,headers:0
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message headers"
 msgstr ""
 
 #. module: mail
-#: field:mail.compose.message,email_bcc:0
-#: field:mail.message,email_bcc:0
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
 msgstr ""
@@ -484,8 +477,7 @@ msgid "mail.message.common"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,references:0
-#: help:mail.message,references:0
+#: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
@@ -496,8 +488,7 @@ msgid "Error ! You cannot create recursive associated members."
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,email_cc:0
-#: help:mail.message,email_cc:0
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
 msgstr ""
@@ -513,8 +504,7 @@ msgid "Email Message"
 msgstr ""
 
 #. module: mail
-#: model:ir.model,name:mail.model_mail_thread
-#: view:mail.thread:0
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
 msgstr ""
 
@@ -530,9 +520,7 @@ msgid "Mail attachment"
 msgstr ""
 
 #. module: mail
-#: help:mail.compose.message,reply_to:0
-#: help:mail.message,reply_to:0
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
 msgstr ""
-
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index de4bcee4f76..27ec13b2147 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -228,7 +228,7 @@ class mail_compose_message(osv.osv_memory):
                     # processed as soon as the mail scheduler runs.
                     mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
                         model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
-                        attachments=attachment, references=references, res_id=int(mail.res_id),
+                        attachments=attachment, references=references, res_id=active_id,
                         subtype=mail.subtype, headers=headers, context=context)
             else:
                 # normal mode - no mass-mailing