summaryrefslogtreecommitdiff
path: root/addons/document_ics
diff options
context:
space:
mode:
authorssi <ssi@tinyerp.com>2010-11-18 16:08:32 +0530
committerssi <ssi@tinyerp.com>2010-11-18 16:08:32 +0530
commitde7da549b43cb70afdc2410b60bc0e2fb3de33dc (patch)
treec19145ed9e61adef2c3c509b5403e6261407e95f /addons/document_ics
parentf4d2b79fa73c62063cd8ecf369fdb8b18c1e3333 (diff)
parenta5bd782fd11221c76836fd852fc5f99eabf888ce (diff)
Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: ssi@tinyerp.com-20101118103832-3meff0cd18v9p22o
Diffstat (limited to 'addons/document_ics')
-rw-r--r--addons/document_ics/document_demo.xml5
-rw-r--r--addons/document_ics/document_ics_config_wizard.xml3
-rw-r--r--addons/document_ics/document_view.xml2
3 files changed, 3 insertions, 7 deletions
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index a0e35563857..d3022a685e6 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -7,14 +7,9 @@
<field name="code">shcal</field>
</record>
- <record model="document.directory" id="document.dir_calendars">
- <field name="name">Calendars</field>
- </record>
-
<record model="document.directory.content" id="dir_content_calendar">
<field name="name">Calendars</field>
<field name="suffix">meetings</field>
- <field name="directory_id" ref="document.dir_calendars"/>
<field name="extension">.ics</field>
<field name="include_name" eval="False"/>
<field name="object_id" ref="crm.model_crm_meeting"/>
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index e58f48cad4c..e338765e97d 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -51,7 +51,8 @@
<field name="target">new</field>
</record>
- register configuration wizard
+<!-- register configuration wizard -->
+
<record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
<field name="action_id" ref="action_view_document_ics_config_directories"/>
<field name="restart">always</field>
diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index 39b6908dc76..40174612539 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -24,7 +24,7 @@
<field name="inherit_id" ref="view_document_directory_form_1"/>
<field name="arch" type="xml">
<field name="report_id" position="replace">
- <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+ <field name="report_id" domain="[('type', '=', 'ressource'),('model_id','=',parent.ressource_type_id)]"/>
<separator string="ICS Calendar" colspan="4"/>
<field name="ics_domain"/>
<field name="ics_field_ids" colspan="4">