From 461e41910255a1366270cd8e54d263b267c299de Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Fri, 8 Jul 2011 15:12:03 +0200
Subject: [PATCH] [FIX] event.todo don't erase project.task column anymore

bzr revid: tfr@openerp.com-20110708131203-o9cduv00he161ahl
---
 addons/project_caldav/project_caldav.py       | 2 +-
 addons/project_caldav/project_caldav_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index c0f780dfc57..f17ef3050d4 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -28,7 +28,7 @@ from project.project import task as base_project_task
 
 class project_task(osv.osv):
     _name = "project.task"
-    _inherit = ["calendar.todo", "project.task"]
+    _inherit = ["project.task", "calendar.todo"]
     _columns = {
         # force inherit from project.project_task so that 
         # calendar.todo.active is masked oute
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index f361dc9580b..57e9e75a53b 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -66,7 +66,7 @@
             <field name="arch" type="xml">
                 <field name="progress" position="after">
                     <field name="recurrency"/>      
-                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}" />                    
+                     <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>                    
                 </field>
             </field>
         </record>