diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index dfbdc745613..c3aa7bb8720 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -916,7 +916,7 @@ class calendar_event(osv.osv): return [(x.lower(), x) for x in pytz.all_timezones] def onchange_allday(self, cr, uid, ids, allday, context=None): - """Sets duration as 24 Hours if event is selcted for all day + """Sets duration as 24 Hours if event is selected for all day @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @@ -1630,6 +1630,14 @@ true, it will allow you to hide the event alarm information without removing it. if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'): vals['vtimezone'] = vals['vtimezone'][40:] + updated_vals = self.onchange_dates(cr, uid, [], + vals.get('date', False), + vals.get('duration', False), + vals.get('date_deadline', False), + vals.get('allday', False), + context=context) + vals.update(updated_vals.get('value', {})) + res = super(calendar_event, self).create(cr, uid, vals, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 9f27e79d5a5..e9dbd2aa297 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -229,7 +229,7 @@ - + diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index a028e3e0e64..12f0a3f59cc 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -32,7 +32,7 @@ - + diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index f2570a8c57c..1508704d2d6 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -64,7 +64,7 @@ class crm_helpdesk(crm.crm_case, osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.helpdesk')]"), - 'duration': fields.float('Duration'), + 'duration': fields.float('Duration', states={'done': [('readonly', True)]}), 'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ diff --git a/addons/hr/hr.py b/addons/hr/hr.py index c0ac7f473a4..26abd4171a5 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -183,7 +183,7 @@ class hr_employee(osv.osv): return {'value': {'work_email' : work_email}} def _get_photo(self, cr, uid, context=None): - photo_path = addons.get_module_resource('hr','image','photo.png') + photo_path = addons.get_module_resource('hr','image','photo.png') return open(photo_path, 'rb').read().encode('base64') _defaults = { diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 7e315b265a7..3f2d9bad868 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -35,7 +35,7 @@ jth - Alien + Aline apr apr