From 77f150fb034eda3867f716e60815d6b5dc2aa31b Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Wed, 15 Dec 2010 15:12:33 +0530 Subject: [PATCH] [IMP] crm,project_caldav: remove the dulpicate field bzr revid: sbh@tinyerp.com-20101215094233-0y0ycserqvd6kuov --- addons/crm/crm_meeting.py | 11 ----------- addons/project_caldav/project_caldav.py | 2 -- addons/project_caldav/project_caldav_view.xml | 3 ++- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index c4e2371c0c5..f694dcd6570 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -74,17 +74,6 @@ class crm_meeting(crm_case, osv.osv): ('done', 'Done')], 'State', \ size=16, readonly=True), } - def onchange_edit_all(self, cr, uid, ids, rrule_type,edit_all, context=None): - if not context: - context = {} - - data_obj = self.pool.get('ir.model.data') - - value = {} - if edit_all and rrule_type: - for id in ids: - base_calendar.base_calendar_id2real_id(id) - return value _defaults = { 'state': lambda *a: 'draft', 'active': lambda *a: 1, diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py index ef061bde08f..f1a4bc73e4b 100644 --- a/addons/project_caldav/project_caldav.py +++ b/addons/project_caldav/project_caldav.py @@ -41,8 +41,6 @@ class project_task(osv.osv): 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\ \n If the task is over, the states is set to \'Done\'.'), - 'recurrency': fields.boolean('Recurrency', help="Recurrent Tasks"), - 'edit_all': fields.boolean('Edit All', help="Edit all Occurrences of recurrent Task."), } _defaults = { 'state': 'draft', diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml index 9c861590a6c..f3125aeabb3 100644 --- a/addons/project_caldav/project_caldav_view.xml +++ b/addons/project_caldav/project_caldav_view.xml @@ -66,7 +66,8 @@ - +