Merge lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

[Ujjvala Collins]

[BUG-FIX] lp:715708:
--------------------
crm: Fixed problem of email field when meeting is scheduled from opportunity.
     Corrected separator string on meetings.

=== modified file 'crm/crm.py'
--- crm/crm.py	2011-02-02 05:28:36 +0000
+++ crm/crm.py	2011-02-10 05:20:00 +0000
@@ -303,7 +303,10 @@
         if not add:
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email, 'phone': address.phone}}
+        if address.email:
+            return {'value': {'email_from': address.email, 'phone': address.phone}}
+        else:
+            return {'value': {'phone': address.phone}}
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
 
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2011-01-20 17:20:12 +0000
+++ crm/crm_meeting_view.xml	2011-02-10 05:20:00 +0000
@@ -59,7 +59,7 @@
                             <field name="section_id" widget="selection"
                                 groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
+                            <separator colspan="2" string="Contact"/>
                             <field name="partner_id" string="Partner"
                                 on_change="onchange_partner_id(partner_id)" />
                             <field name="partner_address_id"