[IMP]: Fix trace back and improve emil template view

bzr revid: aja@tinyerp.com-20131017120530-g5fvr1qt53r9m2xp

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b4f7959..1d30db4 100644 (file)
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1022,14 +1022,11 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     'attendee_ids': [(4, att_id)]
                 }, context=context)
                 new_attendees.append(att_id)
-
             if mail_to and current_user.email:
                 is_sent_mail = att_obj._send_mail(cr, uid, new_attendees, mail_to,
                     email_from = current_user.email, context=context)
                 if is_sent_mail:
-                    meeting_obj =  self.pool.get('crm.meeting')
-                    meeting_id = meeting_obj.search(cr, uid, [('attendee_ids','in',new_attendees)],context = context)
-                    meeting_obj.message_post(cr, uid, meeting_id, body=_("An invitation email has been sent to attendee(s)"), context=context)
+                    self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee(s)"), context=context)
         return True
 
     def default_organizer(self, cr, uid, context=None):

diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index d34ddd7..b0365d3 100644 (file)
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -95,12 +95,12 @@
                                                 % endif
                                                 % if object.description :
                                                     <tr style=" height: 30px;">
-                                                        <td>
+                                                        <td style="vertical-align:top;">
                                                             <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                                 What
                                                             </div>
                                                         </td>
-                                                        <td colspan="3">
+                                                        <td colspan="3" style="vertical-align:text-top;">
                                                             <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                                 : ${object.description or ''}
                                                             </div>
@@ -109,12 +109,12 @@
                                                 % endif
                                                 % if not object.description :
                                                     <tr style=" height: 30px;color:#909090">
-                                                        <td>
+                                                        <td style="vertical-align:top;">
                                                             <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                                 What
                                                             </div>
                                                         </td>
-                                                        <td colspan="3">
+                                                        <td colspan="3" style="vertical-align:text-top;">
                                                             <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                                 : -
                                                             </div>