[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

4 files changed, 721 insertions, 135 deletions

diff --git a/addons/project_caldav/i18n/de.po b/addons/project_caldav/i18n/de.po
index 6ff01fbafe5..57134c8cfc2 100644
--- a/addons/project_caldav/i18n/de.po
+++ b/addons/project_caldav/i18n/de.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-16 08:55+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"PO-Revision-Date: 2010-12-01 07:23+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-02 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
@@ -73,6 +74,11 @@ msgid "Caldav URL"
 msgstr "Caldav URL"
 
 #. module: project_caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr "Kann kein Feld mehr als einmal verbinden"
+
+#. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "March"
 msgstr "März"
@@ -174,6 +180,11 @@ msgid "Sun"
 msgstr "Son"
 
 #. module: project_caldav
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#. module: project_caldav
 #: selection:project.task,select1:0
 msgid "Day of month"
 msgstr "Tag im Monat"
@@ -194,6 +205,11 @@ msgid "Weeks"
 msgstr "Wochen"
 
 #. module: project_caldav
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#. module: project_caldav
 #: field:project.task,select1:0
 msgid "Option"
 msgstr "Option"
@@ -206,7 +222,7 @@ msgstr "Vertraulich"
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunden"
 
 #. module: project_caldav
 #: selection:project.task,freq:0
@@ -246,7 +262,7 @@ msgstr "Markiere als"
 #. module: project_caldav
 #: help:project.task,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Termin wird automatisch in diesem Intervall wiederholt"
 
 #. module: project_caldav
 #: selection:project.task,byday:0
@@ -254,6 +270,12 @@ msgid "First"
 msgstr "1ster"
 
 #. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "September"
 msgstr "September"
@@ -286,7 +308,7 @@ msgstr "Wähle Daten für Regel"
 #. module: project_caldav
 #: help:project.task,count:0
 msgid "Repeat max that times"
-msgstr ""
+msgstr "Max. Wiederholungen"
 
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
@@ -404,6 +426,11 @@ msgid "of"
 msgstr "von"
 
 #. module: project_caldav
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Busy"
 msgstr "Beschäftigt"
@@ -453,6 +480,8 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Definiert Regel für den Ausschluß von Daten und Zeiten zu automatisch "
+"wiederkehrenden Vorgängen."
 
 #. module: project_caldav
 #: selection:project.task,freq:0
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
new file mode 100644
index 00000000000..566c7db1f5d
--- /dev/null
+++ b/addons/project_caldav/i18n/es.po
@@ -0,0 +1,582 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"PO-Revision-Date: 2010-11-29 07:42+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-30 04:54+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
+"de calendario recurrente."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Cuarto"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Mostrar como"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr "Detalles asignados"
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Público"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "URL de caldav"
+
+#. module: project_caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr "No puede mapear un campo más de una vez"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Viernes"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Todo el día"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Libre"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Lun"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Último"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Días"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "No repetir"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Exclude range"
+msgstr "Excluir rango"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Minutes"
+msgstr "Minutos"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Anual"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "Mar"
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Repetir hasta"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every x"
+msgstr "Repetir cada x"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Organizador"
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "Sáb"
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Participantes"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "Dom"
+
+#. module: project_caldav
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Día del mes"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Localización"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr "Enviar correo a"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Semanas"
+
+#. module: project_caldav
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "¡El Id del certificado debe ser único!"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Seconds"
+msgstr "Segundos"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Horas"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "ID recurrente"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "Julio"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "Jue"
+
+#. module: project_caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la definición de la vista!"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Cada día"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Marcar como"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Permite que el evento se repita en ese intervalo"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Primero"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr "CalDAV para la gestión de tareas"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Custom Recurrency Rule"
+msgstr "Regla de recurrencia personalizada"
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat max that times"
+msgstr "Repetir max. estas veces"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Cada semana"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Edit All"
+msgstr "Editar todo"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "Vie"
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Lacalización del evento"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Regla recurrente"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "De"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Recordar"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr "Detalle de la asignación"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "Lunes"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Tercero"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "Junio"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Fecha escritura"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Count"
+msgstr "Contador"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "Enero"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr "Hasta el"
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "ID fecha recurrente"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Frecuencia"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "de"
+
+#. module: project_caldav
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Ocupado"
+
+#. module: project_caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Recurrencia"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "Jueves"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Custom"
+msgstr "Personalizado"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Exception de regla"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Otro"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Años"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr "Asignar Tarea"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Interval"
+msgstr "Intervalo"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Fecha/horas excepción"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarma"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "Abril"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Día de la semana"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "Por día"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr "El"
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Segundo"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr "Sábado"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr "Quinto"
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index f68d94e1cf5..b1c98a8db8c 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12:56+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:56+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44:19+0000\n"
+"PO-Revision-Date: 2010-12-03 15:44:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -67,13 +67,13 @@ msgid "Caldav URL"
 msgstr ""
 
 #. module: project_caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
+#: selection:project.task,month_list:0
+msgid "March"
 msgstr ""
 
 #. module: project_caldav
-#: selection:project.task,month_list:0
-msgid "March"
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_caldav
@@ -173,11 +173,6 @@ msgid "Sun"
 msgstr ""
 
 #. module: project_caldav
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: project_caldav
 #: selection:project.task,select1:0
 msgid "Day of month"
 msgstr ""
@@ -198,11 +193,6 @@ msgid "Weeks"
 msgstr ""
 
 #. module: project_caldav
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: project_caldav
 #: field:project.task,select1:0
 msgid "Option"
 msgstr ""
@@ -238,11 +228,6 @@ msgid "Thu"
 msgstr ""
 
 #. module: project_caldav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Daily"
 msgstr ""
@@ -419,21 +404,11 @@ msgid "of"
 msgstr ""
 
 #. module: project_caldav
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Busy"
 msgstr ""
 
 #. module: project_caldav
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: project_caldav
 #: view:project.task:0
 #: field:project.task,rrule_type:0
 msgid "Recurrency"
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index 3030b28dba9..35f0ab1d773 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -1,64 +1,64 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">       
+    <data noupdate="1">       
 
         <record model="basic.calendar" id="caldav.basic_calendar2">
-	    <field name="name">Tasks</field>
-		<field name="collection_id" ref="document.dir_calendars"></field>
-		<field name="type">vtodo</field>
-	    </record>
-		
+        <field name="name">Tasks</field>
+        <field name="collection_id" ref="document.dir_calendars"></field>
+        <field name="type">vtodo</field>
+        </record>
+        
         <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
-			<field name="name">vtodo</field>
-			<field name="calendar_id" ref="caldav.basic_calendar2" />
-			<field name="object_id" search="[('model','=','project.task')]" />
+            <field name="name">vtodo</field>
+            <field name="calendar_id" ref="caldav.basic_calendar2" />
+            <field name="object_id" search="[('model','=','project.task')]" />
             <field name="domain">[('user_id','=', uid)]</field>
-		</record>		
-		
-		<record model="basic.calendar.fields" id="map_todo_1">
-			<field name="name" ref="caldav.field_todo_status" />
-			<field name="type_id" ref="caldav.calendar_lines_todo" />
-			<field name="field_id" search="[('name','=','state'),('model_id.model','=','project.task')]" />
-			<field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
-			<field name="fn">field</field>
-		</record>
+        </record>       
+        
+        <record model="basic.calendar.fields" id="map_todo_1">
+            <field name="name" ref="caldav.field_todo_status" />
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+            <field name="field_id" search="[('name','=','state'),('model_id.model','=','project.task')]" />
+            <field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
+            <field name="fn">field</field>
+        </record>
 
         <record model="basic.calendar.fields" id="map_todo_2">
             <field name="name" ref="caldav.field_todo_exdate"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_3">
-			<field name="name" ref="caldav.field_todo_attendee" />
-			<field name="type_id" ref="caldav.calendar_lines_todo" />
-			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
-		</record>
+            <field name="name" ref="caldav.field_todo_attendee" />
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+            <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]" />
+            <field name="fn">field</field>
+        </record>
 
         <record model="basic.calendar.fields" id="map_todo_4">
             <field name="name" ref="caldav.field_todo_valarm"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_5">
             <field name="name" ref="caldav.field_todo_description"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <!-- Sequence is not impemented right. 
-	    See http://tools.ietf.org/html/rfc5545#section-3.8.7.4
-	    Disabling..
-	
+        See http://tools.ietf.org/html/rfc5545#section-3.8.7.4
+        Disabling..
+    
         <record model="basic.calendar.fields" id="map_todo_6">
             <field name="name" ref="caldav.field_todo_seq"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
         -->
@@ -66,176 +66,176 @@
         <record model="basic.calendar.fields" id="map_todo_7">
             <field name="name" ref="caldav.field_todo_url"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_9">
-		    <field name="name" ref="caldav.field_todo_percent"/>
-		    <field name="type_id" ref="caldav.calendar_lines_todo" />
-			<field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
-		</record>
-	
-	
-		<record model="basic.calendar.fields" id="map_todo_10">
+            <field name="name" ref="caldav.field_todo_percent"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+            <field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
+            <field name="fn">field</field>
+        </record>
+    
+    
+        <record model="basic.calendar.fields" id="map_todo_10">
             <field name="name" ref="caldav.field_todo_vtimezone"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
-	   </record>
-	
+       </record>
+    
         <record model="basic.calendar.fields" id="map_todo_11">
             <field name="name" ref="caldav.field_todo_summary"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_12">
-			<field name="name" ref="caldav.field_event_priority"/>
-			<field name="type_id" ref="caldav.calendar_lines_todo" />
-			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
-			<field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
-		</record>
+            <field name="name" ref="caldav.field_event_priority"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+            <field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
+            <field name="fn">field</field>
+            <field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
+        </record>
 
         <record model="basic.calendar.fields" id="map_todo_13">
             <field name="name" ref="caldav.field_todo_location"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_14">
             <field name="name" ref="caldav.field_todo_exrule"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_15">
-		    <field name="name" ref="caldav.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">hours</field>
-		</record>
+            <field name="name" ref="caldav.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">hours</field>
+        </record>
 
         <record model="basic.calendar.fields" id="map_todo_16">
             <field name="name" ref="caldav.field_todo_dtstart"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_17">
             <field name="name" ref="caldav.field_todo_rrule"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_18">
             <field name="name" ref="caldav.field_todo_class"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_todo_19">
             <field name="name" ref="caldav.field_todo_uid"/>
             <field name="type_id" ref="caldav.calendar_lines_todo" />
-	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
+            <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
             <field name="fn">field</field>
-        </record>	
-		
+        </record>   
+        
         <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm2">
-			<field name="name">valarm</field>
-			<field name="calendar_id" ref="caldav.basic_calendar2" />
-			<field name="object_id" search="[('model','=','calendar.alarm')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee2">
-			<field name="name">attendee</field>
-			<field name="calendar_id" ref="caldav.basic_calendar2" />
-			<field name="object_id" search="[('model','=','calendar.attendee')]" />
-		</record>
-		
+            <field name="name">valarm</field>
+            <field name="calendar_id" ref="caldav.basic_calendar2" />
+            <field name="object_id" search="[('model','=','calendar.alarm')]" />
+        </record>
+        
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_attendee2">
+            <field name="name">attendee</field>
+            <field name="calendar_id" ref="caldav.basic_calendar2" />
+            <field name="object_id" search="[('model','=','calendar.attendee')]" />
+        </record>
+        
 
         <record model="basic.calendar.fields" id="map_alarm_1">
             <field name="name" ref="caldav.field_alarm_attendee"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+            <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_2">
             <field name="name" ref="caldav.field_alarm_trigger_duration"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_3">
             <field name="name" ref="caldav.field_alarm_description"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+            <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_4">
             <field name="name" ref="caldav.field_alarm_attach"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+            <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_5">
             <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_6">
             <field name="name" ref="caldav.field_alarm_trigger_interval"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_7">
             <field name="name" ref="caldav.field_alarm_summary"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+            <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_8">
             <field name="name" ref="caldav.field_alarm_duration"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_9">
             <field name="name" ref="caldav.field_alarm_repeat"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_10">
             <field name="name" ref="caldav.field_alarm_action"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+            <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_alarm_11">
             <field name="name" ref="caldav.field_alarm_trigger_related"/>
             <field name="type_id" ref="caldav.calendar_lines_alarm2" />
-	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+            <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
             <field name="fn">field</field>
         </record>
 
@@ -243,79 +243,79 @@
         <record model="basic.calendar.fields" id="map_attendee_1">
             <field name="name" ref="caldav.field_attendee_cn"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_2">
             <field name="name" ref="caldav.field_attendee_sent-by"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_3">
             <field name="name" ref="caldav.field_attendee_language"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_4">
             <field name="name" ref="caldav.field_attendee_delegated-from"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_5">
             <field name="name" ref="caldav.field_attendee_member"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_6">
             <field name="name" ref="caldav.field_attendee_cutype"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_7">
             <field name="name" ref="caldav.field_attendee_role"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_8">
             <field name="name" ref="caldav.field_attendee_partstat"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_9">
             <field name="name" ref="caldav.field_attendee_delegated-to"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_10">
             <field name="name" ref="caldav.field_attendee_dir"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
 
         <record model="basic.calendar.fields" id="map_attendee_11">
             <field name="name" ref="caldav.field_attendee_rsvp"/>
             <field name="type_id" ref="caldav.calendar_lines_attendee2" />
-	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+            <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
-		
-	</data>
+        
+    </data>
 </openerp>