[MERGE/IMP]:merged knowledge

bzr revid: apa@tinyerp.com-20120720110726-irl2l5kz4oj6k5t9
This commit is contained in:
Amit Patel (OpenERP) 2012-07-20 16:37:26 +05:30
commit 476b8cf4da
1 changed files with 32 additions and 11 deletions

View File

@ -1,3 +1,4 @@
<openerp> <openerp>
<data> <data>
@ -6,27 +7,47 @@
<field name="model">knowledge.config.settings</field> <field name="model">knowledge.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Knowledge" version="7.0"> <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Wiki"/>
<group> <group>
<group string="Wiki"> <label for="id" string="Wiki Settings"/>
<field name="module_wiki_faq"/> <div>
<field name="module_wiki_quality_manual"/> <div>
</group> <field name="module_wiki_faq" class="oe_inline"/>
<group string="Documents"> <label for="module_wiki_faq"/>
<field name="module_document"/> </div>
<field name="module_document_ftp"/> <div>
<field name="module_document_webdav"/> <field name="module_wiki_quality_manual" class="oe_inline"/>
</group> <label for="module_wiki_quality_manual"/>
</div>
</div>
</group>
<separator string="Documents"/>
<group>
<label for="id" string="Document Settings"/>
<div>
<div>
<field name="module_document" class="oe_inline"/>
<label for="module_document"/>
</div>
<div>
<field name="module_document_ftp" class="oe_inline"/>
<label for="module_document_ftp"/>
</div>
<div>
<field name="module_document_webdav" class="oe_inline"/>
<label for="module_document_webdav"/>
</div>
</div>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_knowledge_configuration" model="ir.actions.act_window"> <record id="action_knowledge_configuration" model="ir.actions.act_window">
<field name="name">Configure Knowledge</field> <field name="name">Configure Knowledge</field>
<field name="res_model">knowledge.config.settings</field> <field name="res_model">knowledge.config.settings</field>