From 3a8f6c24378f2f4270bcd0c37c3d3b769bc32b64 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 15 Dec 2010 12:57:45 +0530
Subject: [PATCH 1/4] [REVERT] Reapplied changes of crm and project_caldav
 reverted during merge.

bzr revid: uco@tinyerp.com-20101215072745-3hskg8z1pf0q15u0
---
 addons/base_calendar/base_calendar.py         |   4 +-
 addons/crm/board_crm_view.xml                 |   2 +-
 addons/crm/crm_meeting.py                     |  55 +++------
 addons/crm/crm_meeting_view.xml               | 112 +++++++++---------
 addons/crm/test/test_crm_meeting.yml          |   2 +-
 addons/project_caldav/project_caldav.py       |   2 +
 addons/project_caldav/project_caldav_view.xml | 107 +++++++++--------
 7 files changed, 130 insertions(+), 154 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c567105547d..300cec34699 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1151,9 +1151,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                 ('daily', 'Days'), \
                                 ('weekly', 'Weeks'), \
                                 ('monthly', 'Months'), \
-                                ('yearly', 'Years'), \
-                                ('secondly', 'Seconds'), \
-                                ('minutely', 'Minutes') ], 'Frequency'),
+                                ('yearly', 'Years')], 'Frequency'),
         'interval': fields.integer('Interval', help="Repeat every x"),
         'count': fields.integer('Count', help="Repeat max that times"),
         'mo': fields.boolean('Mon'),
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 80e7fbfed0c..b8342709220 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -153,7 +153,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
             name="Sales Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 13784741892..735cfc345c6 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -72,55 +72,28 @@ class crm_meeting(crm_case, osv.osv):
                                     ('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Done')], 'State', \
-                                    size=16, readonly=True)
+                                    size=16, readonly=True),
+        'recurrency': fields.boolean('Recurrency', help="Recurrent Meeting"),                                    
+        'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Meeting."),         
     }
-
-    _defaults = {
-        'state': lambda *a: 'draft', 
-        'active': lambda *a: 1,
-        'user_id': lambda self, cr, uid, ctx: uid,
-    }
-
-    def open_meeting(self, cr, uid, ids, context=None):
-        """
-        Open Crm Meeting Form for Crm Meeting.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of crm meeting’s IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value which open Crm Meeting form.
-        """
-
+    
+    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 = {}
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-        id4 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        if id4:
-            id4 = data_obj.browse(cr, uid, id4, context=context).res_id
-        for id in ids:
-            value = {
-                    'name': _('Meeting'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'crm.meeting',
-                    'view_id': False,
-                    'views': [(id2, 'form'), (id3, 'tree'), (id4, 'calendar')],
-                    'type': 'ir.actions.act_window',
-                    'res_id': base_calendar.base_calendar_id2real_id(id),
-                    'nodestroy': True
-                    }
-
+        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,
+        'user_id': lambda self, cr, uid, ctx: uid,
+    }
 
     def case_open(self, cr, uid, ids, *args):
         """Confirms meeting
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2de562a23ce..f78ba91d2d2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -43,63 +43,10 @@
                     <field name="location" />
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
-                    <group colspan="2" col="4" >
-                           <field name="rrule_type" string="Recurrency"
-                                colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                           <button string="Edit All"
-                               help="Edit all Occurrences of recurrent Meeting"
-                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                               name="open_meeting" icon="gtk-edit"
-                               type="object" />
-                           <button string="Exclude range" groups="base.group_extended"
-                                help="Add Exception Rule"
-                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-                                context="{'model' : 'crm.meeting'}"
-                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
-                    </group>
-                </group>
-                <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                    <separator string="Custom Recurrency Rule" colspan="8"/>
-                    <group col="8" colspan="4">
-                        <field name="interval" />
-                        <field name="freq" />
-                        <field name="count" />
-                        <field name="end_date" />
-                    </group>
-                    <group col="14" colspan="4" name="Select weekdays"
-                        attrs="{'invisible' : [('freq','!=','weekly')]}">
-                        <field name="mo" colspan="1" />
-                        <field name="tu" colspan="1" />
-                        <field name="we" colspan="1" />
-                        <field name="th" colspan="1" />
-                        <field name="fr" colspan="1" />
-                        <field name="sa" colspan="1" />
-                        <field name="su" colspan="1" />
-                        <newline />
-                    </group>
-                    <group col="10" colspan="4"
-                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                        <group col="2" colspan="1">
-                            <field name="select1" />
-                        </group>
-                        <group col="2" colspan="1"
-                            attrs="{'invisible' : [('select1','=','day')]}">
-                            <field name="day"
-                                attrs="{'required' : [('select1','=','date')]}" />
-                        </group>
-                        <group col="3" colspan="1"
-                            attrs="{'invisible' : [('select1','=','date')]}">
-                            <field name="byday" string="The"
-                                attrs="{'required' : [('select1','=','day')]}" />
-                            <field name="week_list" nolabel="1"
-                                attrs="{'required' : [('select1','=','day')]}" />
-                        </group>
-                        <group col="1" colspan="1"
-                            attrs="{'invisible' : [('freq','!=','yearly')]}">
-                            <field name="month_list" string="of"
-                                colspan="1"
-                                attrs="{'required' : [('freq','=','yearly')]}" />
-                        </group>
+                    <group colspan="2" col="4">
+                           <field name="recurrency"/>      
+                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
+                                on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -221,6 +168,57 @@
                             </form>
                         </field>
                     </page>
+                    <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
+	                    <group col="4" colspan="4" name="rrule">
+	                        <group col="2" colspan="2">
+		                        <field name="rrule_type" string="Recurrency"
+	                                    attrs="{'readonly':[('recurrent_uid','!=',False)]}" colspan="2"/>
+	                            <label string="" colspan="2"/>
+	                        </group>
+		                    <separator string="Recurrency Rule" colspan="8"/>
+		                    <group col="6" colspan="4">
+		                        <field name="freq" />
+		                        <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
+		                        <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+		                    </group>
+		                    <group col="14" colspan="4" name="Select weekdays"
+		                        attrs="{'invisible' : [('freq','!=','weekly')]}">
+		                        <field name="mo" colspan="1" />
+		                        <field name="tu" colspan="1" />
+		                        <field name="we" colspan="1" />
+		                        <field name="th" colspan="1" />
+		                        <newline/>
+		                        <field name="fr" colspan="1" />
+		                        <field name="sa" colspan="1" />
+		                        <field name="su" colspan="1" />
+		                        <newline />
+		                    </group>
+		                    <group col="10" colspan="4"
+		                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+		                        <group col="2" colspan="1">
+		                            <field name="select1" />
+		                        </group>
+		                        <group col="2" colspan="1"
+		                            attrs="{'invisible' : [('select1','=','day')]}">
+		                            <field name="day"
+		                                attrs="{'required' : [('select1','=','date')]}" />
+		                        </group>
+		                        <group col="3" colspan="1"
+		                            attrs="{'invisible' : [('select1','=','date')]}">
+		                            <field name="byday" string="The"
+		                                attrs="{'required' : [('select1','=','day')]}" />
+		                            <field name="week_list" nolabel="1"
+		                                attrs="{'required' : [('select1','=','day')]}" />
+		                        </group>
+		                        <group col="1" colspan="1"
+		                            attrs="{'invisible' : [('freq','!=','yearly')]}">
+		                            <field name="month_list" string="of"
+		                                colspan="1"
+		                                attrs="{'required' : [('freq','=','yearly')]}" />
+		                        </group>
+		                    </group>
+		                </group>
+	                </page>
                 </notebook>
             </form>
         </field>
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
index 6dcf56cfe66..eaa58fcea97 100644
--- a/addons/crm/test/test_crm_meeting.yml
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -62,7 +62,7 @@
   Now If I want to edit meetings information for all occurrence I click on "Edit All" button.
 -
   !python {model: crm.meeting}: |
-    self.open_meeting(cr, uid, [ref('crm_meeting_regardingpresentation0')])
+     self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'edit_all':'True'},context)
 - |   
   I can see that new meeting form is opened with same value
   I change some data for meeting and save it
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index f1a4bc73e4b..ef061bde08f 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -41,6 +41,8 @@ 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 cfd27ce4240..f2ebedd538d 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -57,7 +57,7 @@
                 </field>
             </field>
         </record>
-
+        
         <record id="view_project_caldav_task_form2" model="ir.ui.view">
             <field name="name">project.task.caldav.form2</field>
             <field name="model">project.task</field>
@@ -65,64 +65,69 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <group colspan="2" col="4" >
-                           <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                           <button string="Edit All"
-                               help="Edit all Ourrences of recurrent Task"
-                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                               name="open_task" icon="gtk-edit"
-                               type="object" />
-                           <button string="Exclude range" groups="base.group_extended"
-                                help="Add Exception Rule"
-                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-                                context="{'model' : 'project.task'}"
-                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
-                    </group>
-                    <newline/>
-                    <group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                        <separator string="Custom Recurrency Rule" colspan="8"/>
-                        <group col="8" colspan="4">
-                        <field name="interval" />
-                        <field name="freq" />
-                        <field name="count" />
-                        <field name="end_date" />
-                        </group>
-                        <group col="14" colspan="4" name="Select weekdays" 
-                                attrs="{'invisible': [('freq','=','weekly')]}">
-                        <field name="mo" colspan="1" />
-                        <field name="tu" colspan="1" />
-                        <field name="we" colspan="1" />
-                        <field name="th" colspan="1" />
-                        <field name="fr" colspan="1" />
-                        <field name="sa" colspan="1" />
-                        <field name="su" colspan="1" />
-                        <newline />
-                        </group>
-                        <group col="10" colspan="4" attrs="{'invisible': [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                            <group col="2" colspan="1">
-                            <field name="select1" />
-                            </group>
-                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
-                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
-                            </group>
-                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
-                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
-                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
-                            </group>
-                            <group col="1" colspan="1" attrs="{'invisible' : [('freq','!=','yearly')]}">
-                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('freq','=','yearly')]}" />
-                            </group>
-                        </group>
-                    </group>
+                    <field name="recurrency"/>      
+                    <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>
                 </field>
             </field>
         </record>
 
-    <record id="view_project_caldav_task_form3" model="ir.ui.view">
+        <record id="view_project_caldav_task_form3" model="ir.ui.view">
             <field name="name">project.task.caldav.form3</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2" />
             <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook colspan="4" position="inside">
+                    <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
+	                    <group colspan="2" col="4" >
+	                         <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+	                    </group>
+	                    <newline/>
+	                    <group col="4" colspan="6" name="rrule">
+	                        <separator string="Custom Recurrency Rule" colspan="8"/>
+	                        <group col="6" colspan="4">
+		                        <field name="freq" />
+                                <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
+                                <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+	                        </group>
+	                        <group col="14" colspan="4" name="Select weekdays" 
+	                                attrs="{'invisible': [('freq','!=','weekly')]}">
+		                        <field name="mo" colspan="1" />
+		                        <field name="tu" colspan="1" />
+		                        <field name="we" colspan="1" />
+		                        <field name="th" colspan="1" />
+		                        <newline/>
+		                        <field name="fr" colspan="1" />
+		                        <field name="sa" colspan="1" />
+		                        <field name="su" colspan="1" />
+		                        <newline />
+	                        </group>
+	                        <group col="10" colspan="4" attrs="{'invisible': [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+	                            <group col="2" colspan="1">
+	                            <field name="select1" />
+	                            </group>
+	                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
+	                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+	                            </group>
+	                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
+	                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
+	                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
+	                            </group>
+	                            <group col="1" colspan="1" attrs="{'invisible' : [('freq','!=','yearly')]}">
+	                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('freq','=','yearly')]}" />
+	                            </group>
+	                        </group>
+	                    </group>
+                    </page>
+                 </notebook>
+            </field>
+        </record>
+
+    <record id="view_project_caldav_task_form4" model="ir.ui.view">
+            <field name="name">project.task.caldav.form4</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="vtimezone" colspan="2" />

From bc983971ede1f2f278838bffa06cf5f817e15969 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 16 Dec 2010 16:43:48 +0530
Subject: [PATCH 2/4] [FIX] project: Corrected 'parent_id' problem for Project.

lp bug: https://launchpad.net/bugs/690109 fixed

bzr revid: uco@tinyerp.com-20101216111348-d0mgywzig45ym69i
---
 addons/project/project.py       | 1 +
 addons/project/project_data.xml | 3 ++-
 addons/project/project_demo.xml | 5 +++++
 addons/project/project_view.xml | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index b17d9ea6086..9fa35c421dc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -129,6 +129,7 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index b54576ff391..f3bab29250a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -17,12 +17,13 @@
         
         <!--
 		Resource: project.project
-		-->
+		
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
 	
 		<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
+        -->
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 98efff361b3..e3b905fea9d 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -241,6 +241,11 @@
         </record>
 
         <!-- Projects -->
+        <record id="all_projects_account" model="project.project">
+            <field name="name">Projects</field>
+            <field name="code">3</field>
+        </record>
+        
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7a65129af2c..1b9b292344f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" string="Parent Project"/>
+                        <field name="parent_id"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>

From c2c55d4ddca94d5c6d0e55c14b12acd4b8cd6bf0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 20 Dec 2010 14:43:55 +0530
Subject: [PATCH 3/4] [FIX] crm: Fixed log message problem when creating
 opportunity from lead.

lp bug: https://launchpad.net/bugs/691481 fixed

bzr revid: uco@tinyerp.com-20101220091355-5e4d47gphs7uzgop
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e94ac30c605..7fed3cc742c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -89,7 +89,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 self.pool.get('mailgate.message').write(cr, uid, msg_ids, {
                     'partner_id': lead.partner_id.id
                 }, context=context)
-            self.log(cr, uid, lead.id,
+            leads.log(cr, uid, lead.id,
                 _("Lead '%s' has been converted to an opportunity.") % lead.name)
 
         return {

From 63c3b6427d4043506f62b8ee999b7f0185892197 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 20 Dec 2010 15:02:32 +0530
Subject: [PATCH 4/4] [MERGE]: Remaining merge.

bzr revid: uco@tinyerp.com-20101220093232-vo54b3oeaqkzlf10
---
 addons/project_caldav/project_caldav.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index f9a469f2381..ada89d35e69 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',