pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
bzr revid: aja@tinyerp.com-20131017120530-g5fvr1qt53r9m2xp
This commit is contained in:
ajay javiya (OpenERP)
2013-10-17 17:35:30 +05:30
parent cacff8a9f1
commit 6bace2ccfa
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/base_calendar.py
+1 -4
View File
@@ -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):
addons/base_calendar/crm_meeting_data.xml
+4 -4
View File
@@ -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>