diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-29 12:11:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-29 12:11:20 +0200 |
| commit | e8076c3854fcb6d2628dfc5693ebdc9bbfb2b6ec (patch) | |
| tree | 67e7cb59772e7e9b9414224c93b50eed7834b426 | |
| parent | fd65b57b08fe129fd2124e657559f6d33ca31d74 (diff) | |
| parent | 5c7190c93fca33cf421d1818e6d1c0597251cbc6 (diff) | |
[MERGE] forward port of branch saas-3 up to 5c7190c
| -rw-r--r-- | addons/calendar/calendar.py | 2 | ||||
| -rw-r--r-- | openerp/addons/base/module/module.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 59b17819e83..8ccf6639f86 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -960,7 +960,7 @@ class calendar_event(osv.Model): 'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}), 'color_partner_id': fields.related('user_id', 'partner_id', 'id', type="integer", string="colorize", store=False), # Color of creator - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the event alarm information without removing it."), 'categ_ids': fields.many2many('calendar.event.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags'), 'attendee_ids': fields.one2many('calendar.attendee', 'event_id', 'Attendees', ondelete='cascade'), 'partner_ids': fields.many2many('res.partner', 'calendar_event_res_partner_rel', string='Attendees', states={'done': [('readonly', True)]}), diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 62ba2304866..162b10922e4 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -456,7 +456,7 @@ class module(osv.osv): ir_model_data = self.pool.get('ir.model.data') modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)] ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context) - self.write(cr, uid, ids, {'state': 'uninstalled'}) + self.write(cr, uid, ids, {'state': 'uninstalled', 'latest_version': False}) return True def downstream_dependencies(self, cr, uid, ids, known_dep_ids=None, |