From 27044ea0a75b677ecbdbd88f6b4911feef4b9752 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 25 Jan 2010 11:16:13 +0530
Subject: [PATCH 1/2] [IMP]: Caldav: Improvement in export/import ics mapping

bzr revid: rpa@openerp.co.in-20100125054613-owvxxvorfkegl3l2
---
 addons/base_calendar/base_calendar.py             |  5 +++++
 addons/caldav/caldav_data.xml                     |  9 +--------
 addons/crm/crm_meeting_data.xml                   |  6 ++++++
 addons/project_calendar/project_calendar_data.xml | 10 ++++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 51b761250c5..a370ce9b64b 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -23,6 +23,7 @@ from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil.rrule import *
 from osv import osv, fields
+from tools.translate import _
 import base64
 import pooler
 import re
@@ -177,6 +178,10 @@ class CalDAV(object):
         return vals
 
     def create_ics(self, cr, uid, datas, name, ical, context=None):
+        if not datas:
+            model = context.get('model', None)
+            war_str = "No data available" + (model and " for " + model) or "" 
+            raise osv.except_osv(_('Warning !'), _(war_str))
         for data in datas:
             vevent = ical.add(name)
             for field in self.__attribute__.keys():
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index fb464ab95d7..b909bf1dc82 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -340,13 +340,6 @@
     <field name="fn">field</field>
 </record>
 
-<record model="basic.calendar.fields" id="map_todo_10">
-    <field name="name" ref="base_calendar.field_todo_due"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
 <record model="basic.calendar.fields" id="map_todo_11">
     <field name="name" ref="base_calendar.field_todo_summary"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -379,7 +372,7 @@
     <field name="name" ref="base_calendar.field_todo_duration"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
 	<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
+    <field name="fn">hours</field>
 </record>
 
 <record model="basic.calendar.fields" id="map_todo_16">
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 035a5c30175..e13346aed8a 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -27,6 +27,12 @@
 	        <field name="object">crm.meeting</field>
 	    </record>
 
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+		</record>
+		
 
 <!--		Event Attribute mapping-->
 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index b78931381b3..176feddd76f 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data noupdate="1">
-
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','project.task')]" />
+		</record>
+		
 		<record model="basic.calendar.fields" id="caldav.map_todo_1">
 			<field name="name" ref="base_calendar.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -35,7 +41,7 @@
 		    <field name="name" ref="base_calendar.field_todo_duration"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
+			<field name="fn">hours</field>
 		</record>
 		
 	</data>

From 5523a8ffce4b11a5f59a101b5f3b61eea1bee082 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 12:28:32 +0530
Subject: [PATCH 2/2] [FIX] document_change: fixed domain problem in control
 menus

bzr revid: hmo@tinyerp.com-20100125065832-540s277g3qku8nq6
---
 addons/document_change/document_change_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index b5e2413aafa..591b84c5ce9 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -325,7 +325,7 @@
 	            <group expand="1" string="Group By..." col="20" colspan="4">
 	            	<filter domain="[]" string="By Owner" icon="terp-hr" context="{'group_by':'create_uid'}" help="Documents by owner"/>
 	            	<filter domain="[]" string="By Directory" icon="terp-hr" context="{'group_by':'parent_id'}" help="Documents by directory"/>
-	            	<filter domain="[]" string="By Type of Documents" icon="terp-hr" context="{'group_by':'type_id'}" help="Documents by type"/>
+	            	<filter domain="[]" string="By Type of Documents" icon="terp-hr" context="{'group_by':'change_type_id'}" help="Documents by type"/>
 	            </group>
             </search>
         </field>
@@ -367,7 +367,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_document_tree"/>
-        <field name="domain">[('type_id','=',',False)]</field>
+        <field name="domain">[('change_type_id','=',',False)]</field>
     </record>
     <menuitem action="action_document_without_type_form" id="menu_documents_without_type_form" parent="menu_change_control"/>
     
@@ -441,11 +441,11 @@
         <field name="name">Phases to Validate</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
+        <field name="domain">[('state','=','to_validate')]</field>
     </record>	
 	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('type_id', '=', active_id)]" 
+	<act_window domain="[('change_type_id', '=', active_id)]" 
 		id="act_documents_phases" 
 		name="Documents" 
 		res_model="ir.attachment" 
@@ -591,7 +591,7 @@
         <field name="name">Process Changes to Validate</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
+        <field name="domain">[('state','=','to_validate')]</field>
     </record>	
 	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
 	
@@ -601,7 +601,7 @@
 		res_model="document.change.process.phase" 
 		src_model="document.change.process"/>
 	
-	<act_window domain="[('type_id', '=', active_id)]" 
+	<act_window domain="[('change_type_id', '=', active_id)]" 
 		id="act_documents_change_process" 
 		name="Documents" 
 		res_model="ir.attachment"