diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2012-08-14 18:10:04 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2012-08-14 18:10:04 +0530 |
| commit | d2f66681bc4bcafcd2b95e090ebb6ff287a69d89 (patch) | |
| tree | d8c66c00f8d7c9e7e4f2a1b46b4956168828ad39 /addons/document_page | |
| parent | 94b94e6a58c2307ca97c58b479c37a7484dad1ef (diff) | |
| parent | 2376fe0add0409f5ff17218658d939de0e61ecff (diff) | |
[MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120814124004-2sze9pxw03jf0epw
Diffstat (limited to 'addons/document_page')
3 files changed, 0 insertions, 8 deletions
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml index c54be43d226..fc3bd86fdaf 100644 --- a/addons/document_page/document_page_view.xml +++ b/addons/document_page/document_page_view.xml @@ -8,7 +8,6 @@ <record id="view_wiki_tree_children" model="ir.ui.view"> <field name="name">document.page.tree</field> <field name="model">document.page</field> - <field name="type">tree</field> <field name="field_parent">child_ids</field> <field name="priority">100</field> <field name="arch" type="xml"> @@ -23,7 +22,6 @@ <record id="view_wiki_tree" model="ir.ui.view"> <field name="name">document.page.list</field> <field name="model">document.page</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Document Page"> <field name="name"/> @@ -37,7 +35,6 @@ <record id="view_wiki_form" model="ir.ui.view"> <field name="name">document.page.form</field> <field name="model">document.page</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Document Page" version="7.0"> <field name="type" invisible="1"/> @@ -67,7 +64,6 @@ <record id="view_wiki_filter" model="ir.ui.view"> <field name="name">document.page.search</field> <field name="model">document.page</field> - <field name="type">search</field> <field name="arch" type="xml"> <search string="Document Page"> <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/> @@ -110,7 +106,6 @@ <record model="ir.ui.view" id="view_wiki_history_tree"> <field name="name">document.page.history.tree</field> <field name="model">document.page.history</field> - <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Document History"> <field name="create_date"/> @@ -123,7 +118,6 @@ <record model="ir.ui.view" id="wiki_history_form"> <field name="name">document.page.history.form</field> <field name="model">document.page.history</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Document Page History" version="7.0"> <label for="page_id" class="oe_edit_only"/> diff --git a/addons/document_page/wizard/document_page_create_menu_view.xml b/addons/document_page/wizard/document_page_create_menu_view.xml index 6d689dfe41d..e4647179ad2 100644 --- a/addons/document_page/wizard/document_page_create_menu_view.xml +++ b/addons/document_page/wizard/document_page_create_menu_view.xml @@ -5,7 +5,6 @@ <record id="view_wiki_create_menu" model="ir.ui.view"> <field name="name">Create Menu</field> <field name="model">document.page.create.menu</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Create Menu" version="7.0"> <group string="Menu Information"> diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml index c6066669dca..f268db7ad2e 100644 --- a/addons/document_page/wizard/document_page_show_diff_view.xml +++ b/addons/document_page/wizard/document_page_show_diff_view.xml @@ -6,7 +6,6 @@ <record id="view_wiki_show_diff" model="ir.ui.view"> <field name="name">Show Difference</field> <field name="model">wizard.document.page.history.show_diff</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Difference" version="7.0"> <field name="diff"/> |