[imp] improve send email method

bzr revid: fp@tinyerp.com-20091203233912-sl44ls3uh8h3qoy5

diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index c91b23f..ef961b0 100644 (file)
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -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>'''
@@ -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)
@@ -103,10 +103,8 @@ 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):
@@ -114,11 +112,11 @@ def _get_info(self, cr, uid, data, context):
         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!'))
+    #if not case.email_from:
+    #    raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
     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 = {

diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index d760758..73e9147 100644 (file)
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -35,14 +35,14 @@
                     <field name="partner_mobile"/>
                     <field name="email_from" string="Prospect Email"/>
                     <newline/>
-                                        <group colspan="2" col="4">
-                                                <label string="Partner:"  colspan="1" align="1.0"/>
-                                                <field name="partner_id" nolabel="1"  colspan="2"/>
-                                                 <button string="Convert to Partner"
-                                                       icon="terp-partner" name="%(wizard_crm_partner_create)d"
-                                                       type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                                                 />
-                                        </group>
+                     <label string="Partner:"  colspan="1" align="1.0"/>
+                     <group colspan="2" col="2">
+                         <field name="partner_id" nolabel="1" colspan="1"/>
+                          <button string="Convert to Partner"
+                              icon="terp-partner" name="%(wizard_crm_partner_create)d"
+                              type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                          />
+                     </group>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
                     <field name="priority" string="Priority"/>
@@ -116,9 +116,9 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-                                                                  string="Add a CC"
-                                                                   name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                                                   icon="gtk-add" type="action"/>
+                                   string="Add a CC"
+                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
@@ -173,7 +173,7 @@
     </record>
 
 
-       <record id="view_crm_case_leads_filter" model="ir.ui.view">
+    <record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">crm.case.leads.select</field>
         <field name="model">crm.case</field>
         <field name="type">search</field>
@@ -181,27 +181,27 @@
             <search string="Search Prospects">
                <group col="3" colspan="1">
                 <filter icon="gtk-home" string="   Today   "
-                       separator="1"
-                       domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                       help="Todays's Prospects"
+                    separator="1"
+                    domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                    help="Todays's Prospects"
                 />
                 <filter icon="gtk-media-rewind" string="    7 Days    "
-                       separator="1" help="Prospects during last 7 days"
-                       domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    separator="1" help="Prospects during last 7 days"
+                    domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
                </group>
                <separator orientation="vertical"/>
                <group col="4" colspan="2">
                    <field name="name" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                               <filter icon="terp-partner"
-                                       domain="[('user_id','=',uid)]" help="My Prospects"
-                                       default="1"
-                               />
-                               <filter icon="terp-crm"
-                                       domain="[('user_id','child_of',[uid])]"
-                                       help="My department's Prospects"
-                               />
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=',uid)]" help="My Prospects"
+                               default="1"
+                           />
+                           <filter icon="terp-crm"
+                               domain="[('user_id','child_of',[uid])]"
+                               help="My department's Prospects"
+                           />
                    </field>
                    <field name="state" select="1">
                        <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Prospects"/>