[IMP] event: change the name of tinycrm to object_id

[odoo/odoo.git] / addons / crm / wizard / wizard_crm_new_send_email.py

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index c91b23f..42b2f24 100644 (file)
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -46,7 +46,7 @@ email_send_form = '''<?xml version="1.0"?>
     <field name="doc2" />
     <newline/>
     <field name="doc3" />
-    <separator colspan="4" string="State of Case"/>
+    <separator colspan="4" string="Set case state to"/>
     <newline/>
     <field name="state" />
 </form>'''
@@ -70,7 +70,7 @@ def _mass_mail_send(self, cr, uid, data, context):
     attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
 
     pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get('crm.case')
+    case_pool=pool.get(data.get('model'))
 
     case = case_pool.browse(cr,uid,data['ids'])[0]
     case_pool.write(cr, uid, [case.id], {
@@ -81,7 +81,7 @@ def _mass_mail_send(self, cr, uid, data, context):
     emails = filter(None, emails)
     body = data['form']['text']
     if not case.user_id.address_id.email:
-        raise wizard.except_wizard(_('Warning!'),("Please specify user's email address"))
+        raise wizard.except_wizard(_('Warning!'),_("Please specify user's email address !"))
     if case.user_id.signature:
         body += '\n\n%s' % (case.user_id.signature)
     case_pool._history(cr, uid, [case], _('Send'), history=True, email=False, details=body)
@@ -89,11 +89,11 @@ def _mass_mail_send(self, cr, uid, data, context):
         case.user_id.address_id.email,
         emails,
         data['form']['subject'],
-        body,
         case_pool.format_body(body),
         attach=attach,
         reply_to=case.section_id.reply_to,
-        tinycrm=str(case.id)
+        
+        openobject_id=str(case.id)
     )
     if flag:
         if data['form']['state'] == 'unchanged':
@@ -103,22 +103,25 @@ def _mass_mail_send(self, cr, uid, data, context):
         elif data['form']['state'] == 'pending':
             case_pool.case_pending(cr, uid, data['ids'])
         cr.commit()
-        raise wizard.except_wizard(_('Message!'),("Email Successfully Sent..!!"))
-        
     else:
-        raise wizard.except_wizard(_('Warning!'),("Email is not sent Successfully"))
+        raise wizard.except_wizard(_('Warning!'),_("Email not sent !"))
     return {}
 
 def _get_info(self, cr, uid, data, context):
     if not data['id']:
         return {}
+        
     pool = pooler.get_pool(cr.dbname)
-    case = pool.get('crm.case').browse(cr,uid,data['ids'])[0]
-    if not case.email_from:
-        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
+    case = pool.get(data.get('model')).browse(cr, uid, data['id'])
+
     if not case.user_id:
         raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or ''}
+        
+    return {
+        'to': case.email_from, 
+        'subject': case.name, 
+        'cc': case.email_cc or ''
+    }
     
 class wizard_send_mail(wizard.interface):
     states = {