summaryrefslogtreecommitdiff
path: root/addons/document/document_view.xml
diff options
context:
space:
mode:
authorksa (Open ERP) <ksa@tinyerp.co.in>2010-05-26 11:22:45 +0530
committerksa (Open ERP) <ksa@tinyerp.co.in>2010-05-26 11:22:45 +0530
commitd5acd5897b72a612a1b1ee85f40713979dcf403e (patch)
tree4b9dcf900c9000de9ae97fd3dd4ba41891d290a3 /addons/document/document_view.xml
parent631cdfc3c6ea9afab23293887193ee01542d7382 (diff)
parent5f936d961cf42db4312a840caedc7be7c18c27cf (diff)
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100526055245-0szwstusyu9x5oi0
Diffstat (limited to 'addons/document/document_view.xml')
-rw-r--r--addons/document/document_view.xml7
1 files changed, 1 insertions, 6 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 7f062f33847..720ab6de69f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -71,7 +71,7 @@
<newline/>
<field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
<field name="ressource_tree"/>
- <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+ <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
<field name="ressource_id" select="2" readonly="1"/>
<field name="ressource_parent_type_id"/>
</page>
@@ -252,7 +252,6 @@
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
</record>
-
<menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
<menuitem
name="Documents"
@@ -314,10 +313,6 @@
</field>
</record>
- <menuitem parent="menu_document_doc"
- id="menu_action_wiki_wiki" name="FAQ"
- action="wiki.action_wiki_test" />
-
<act_window domain="[('partner_id', '=', active_id)]"
id="act_res_partner_document" name="Related Documents"
res_model="ir.attachment"