merge

bzr revid: fp@tinyerp.com-20091201082650-e6n201rwss3u0etn

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/crm/crm.py
index 0fe2677,31249c4..84cf9a2
--- 1/addons/crm/crm.py
--- 2/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@@ -799,10 -800,14 +799,12 @@@ class crm_case(osv.osv)
              if not case.section_id.reply_to:
                  raise osv.except_osv(_('Error!'),("Reply TO is not specified in Section"))
              if not case.email_from:
 -                raise osv.except_osv(_('Error!'),("Partner Email is not specified in Case"))            
 +                raise osv.except_osv(_('Error!'),("Partner Email is not specified in Case"))
              if case.section_id.reply_to and case.email_from:
                  src = case.email_from
- 
 -                
+                 if not src:
+                     raise osv.except_osv(_('Error!'),
+                         _("No E-Mail ID Found for the Responsible Partner or missing reply address in section!"))
 -                    
                  dest = case.section_id.reply_to
                  body = case.email_last or case.description
                  if not destination:

diff --cc addons/crm/crm_view.xml
index 87617aa,e8b0ddf..0a163b3
--- 1/addons/crm/crm_view.xml
--- 2/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@@ -704,8 -704,8 +704,7 @@@
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="crm_email_gateway_server_tree"/>
          </record>
 -        <menuitem id="crm_email_gateway_server_menu" name="Email Gateway Server" parent="next_id_51" action="crm_email_gateway_server_act" />      
 -
 +        <menuitem id="crm_email_gateway_server_menu" name="Email Gateway Server" parent="next_id_51" action="crm_email_gateway_server_act" />
  
- 
      </data>
  </openerp>

diff --cc addons/sale/sale_view.xml
Simple merge