odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: indentation 

bzr revid: aja@tinyerp.com-20130816124741-6bk10d2z3eiwn3a4
This commit is contained in:
ajay javiya (OpenERP) 2013-08-16 18:17:41 +05:30
parent a964a56ec7
commit 17620a2326
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/base_calendar/base_calendar.py
View File

@ -411,6 +411,9 @@ property or property parameter."),
@return: True
"""
mail_id = []
data_pool = self.pool.get('ir.model.data')
mail_pool = self.pool.get('mail.mail')
template_pool = self.pool.get('email.template')
local_context = context.copy()
color = {
'needs-action' : 'grey',
@ -418,16 +421,15 @@ property or property parameter."),
'tentative' :'#FFFF00',
'declined':'red',
'delegated':'grey'
}
}
for attendee in self.browse(cr, uid, ids, context=context):
res_obj = attendee.ref
data_pool = self.pool.get('ir.model.data')
if res_obj:
model,template_id = data_pool.get_object_reference(cr, uid, 'base_calendar', "crm_email_template_meeting_invitation")
model,act_id = data_pool.get_object_reference(cr, uid, 'base_calendar', "view_crm_meeting_calendar")
action_id = self.pool.get('ir.actions.act_window').search(cr, uid, [('view_id','=',act_id)], context=context)
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
body = self.pool.get('email.template').browse(cr, uid, template_id, context=context).body_html
body = template_pool.browse(cr, uid, template_id, context=context).body_html
if attendee.email and email_from:
ics_file = self.get_ics_file(cr, uid, res_obj, context=context)
local_context['att_obj'] = attendee
@ -435,13 +437,13 @@ property or property parameter."),
local_context['action_id'] = action_id[0]
local_context['dbname'] = cr.dbname
local_context['base_url'] = base_url
vals = self.pool.get('email.template').generate_email(cr, uid, template_id, res_obj.id, context=local_context)
vals = template_pool.generate_email(cr, uid, template_id, res_obj.id, context=local_context)
if ics_file:
vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics',
'datas_fname': 'invitation.ics',
'datas': str(ics_file).encode('base64')})]
mail_id.append(self.pool.get('mail.mail').create(cr, uid, vals, context=context))
self.pool.get('mail.mail').send(cr, uid, mail_id, context=context)
mail_id.append(mail_pool.create(cr, uid, vals, context=context))
mail_pool.send(cr, uid, mail_id, context=context)
return True
def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
@ -506,7 +508,7 @@ property or property parameter."),
context = {}
meeting_obj = self.pool.get('crm.meeting')
for vals in self.browse(cr, uid, ids, context=context):
meeting_id = meeting_obj.search(cr, uid, [('attendee_ids','=',vals.id)],context = context)
meeting_id = meeting_obj.search(cr, uid, [('attendee_ids','=',vals.id)], context=context)
if meeting_id and vals.state != 'declined':
meeting_obj.message_post(cr, uid, meeting_id, body=_(("%s has Declined Invitation") % (vals.cn)), context=context)
self.write(cr, uid, vals.id, {'state': 'declined'}, context)

12
addons/base_calendar/crm_meeting.py
View File

@ -75,9 +75,11 @@ class crm_meeting(base_state, osv.Model):
"""
Return date and time (from to from) based on duration with timezone in string :
eg.
1) if user add duration for 2 hours return : August-23-2013 at ( 04-30 To 06-30) (Europe/Brussels)
2) if event all day return : AllDay , July-31-2013
1) if user add duration for 2 hours, return : August-23-2013 at ( 04-30 To 06-30) (Europe/Brussels)
2) if event all day ,return : AllDay, July-31-2013
"""
if context is None:
context = {}
tz = context.get('tz', pytz.timezone('UTC'))
meeting = self.browse(cr, uid, meeting_id, context=context)
date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
@ -111,10 +113,10 @@ class crm_meeting(base_state, osv.Model):
'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
'event_id', 'attendee_id', 'Invited People', states={'done': [('readonly', True)]}),
'is_attendee': fields.function(_compute, string='Attendee', \
type="boolean",multi='attendee'),
type="boolean", multi='attendee'),
'attendee_status': fields.function(_compute, string='Attendee Status', \
type="selection",multi='attendee'),
'event_time': fields.function(_compute, string='Event Time', type="char",multi='attendee'),
type="selection", multi='attendee'),
'event_time': fields.function(_compute, string='Event Time', type="char", multi='attendee'),
}
_defaults = {
'state': 'open',

6
addons/base_calendar/static/src/css/base_calender.css
View File

@ -6,13 +6,13 @@
}
.openerp .needs-action , .tentative,.text-core .text-tag .custom-edit, .text-core .text-tag .tentative {
background : url(/web/static/src/img/icons/gtk-normal.png) no-repeat;
background-size : 11px 11px;
background-size : 11px 11px;
}
.openerp .accepted , .text-core .text-tag .accepted {
background : url(/web/static/src/img/icons/gtk-yes.png) no-repeat;
background-size : 11px 11px;
background-size : 11px 11px;
}
.openerp .declined , .text-core .text-tag .declined {
background : url(/web/static/src/img/icons/gtk-no.png) no-repeat;
background-size : 11px 11px;
background-size : 11px 11px;
}