odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20100629095747-svyjt9e9qak74y3c
This commit is contained in:
Fabien Pinckaers 2010-06-29 11:57:47 +02:00
parent 8b7d522a9c
commit 0589af4d6b
8 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/caldav/caldav_view.xml
View File

@ -57,7 +57,7 @@
<menuitem
id="menu_calendar"
name="Calendar"
parent="base.menu_document_configuration"/>
parent="knowledge.menu_document_configuration"/>
<menuitem
action="action_calendar_collection_form"

2
addons/document/__openerp__.py
View File

@ -40,7 +40,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base', 'process','board'],
'depends': ['process','board', 'knowledge'],
'init_xml': [],
'update_xml': [
'security/document_security.xml',

9
addons/document/document_view.xml
View File

@ -1,11 +1,6 @@
<openerp>
<data>
<!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
<menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="group_document_user"/>
<menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
<record model="ir.ui.view" id="view_document_storage_form">
<field name="name">document.storage</field>
@ -323,7 +318,7 @@
<field name="name">Document</field>
<field name="view_type">form</field>
</record>
<menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
<menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="5"/>
<menuitem
name="Documents"
action="action_document_file_form"

2
addons/document/security/document_security.xml
View File

@ -10,7 +10,7 @@
<field name="name">Document / Manager</field>
</record>
<record id="base.menu_document_configuration" model="ir.ui.menu">
<record id="knowledge.menu_document_configuration" model="ir.ui.menu">
<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
</record>

6
addons/document_email/document_email.xml
View File

@ -93,11 +93,5 @@
<field name="domain">[]</field>
</record>
<!-- <menuitem -->
<!-- parent="base.menu_document"-->
<!-- id="menu_action_document_email_tree" -->
<!-- name="Email to Documents"-->
<!-- action="action_document_email_form"/>-->
</data>
</openerp>

1
addons/knowledge/__openerp__.py
View File

@ -32,6 +32,7 @@
'update_xml': [
'security/ir.model.access.csv',
'knowledge_installer.xml',
'knowledge_view.xml',
],
'demo_xml': [],
'installable': True,

2
addons/wiki/__openerp__.py
View File

@ -30,7 +30,7 @@
""",
'author': 'Tiny & Axelor',
'website': 'http://openerp.com',
'depends': ['base'],
'depends': ['knowledge'],
'init_xml': [],
'update_xml': [
'wizard/wiki_wiki_page_open_view.xml',

12
addons/wiki/wiki_view.xml
View File

@ -2,17 +2,15 @@
<openerp>
<data>
<menuitem name="Knowledge" icon="terp-stock"
id="base.menu_document" sequence="19" />
id="knowledge.menu_document" sequence="19" />
<menuitem name="Configuration"
id="base.menu_document_configuration"
parent="base.menu_document" sequence="50" />
id="knowledge.menu_document_configuration"
parent="knowledge.menu_document" sequence="50" />
<menuitem name="Wiki" id="menu_wiki_configuration"
parent="base.menu_document_configuration" sequence="2" />
parent="knowledge.menu_document_configuration" sequence="2" />
<menuitem id="base.menu_document2" name="Collaborative Content"
parent="base.menu_document" />
<!-- Wiki Groups Tree view -->
@ -190,7 +188,7 @@
<field name="search_view_id" ref="view_wiki_filter"/>
</record>
<menuitem parent="base.menu_document2"
<menuitem parent="knowledge.menu_document2"
id="menu_action_wiki_wiki" name="Wiki Pages"
action="action_wiki" />