Merge remote branch 'origin/dms-bugfix' into trunk-fix-webdav

bzr revid: p_christ@hol.gr-20100628074745-dj2ly9gsfvs6pifw
This commit is contained in:
P. Christeas
2010-06-28 10:47:45 +03:00
276 changed files with 9807 additions and 5973 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
<!--<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="base.group_user"/>
<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"/>
@@ -350,7 +350,7 @@
<field name="name">Directory</field>
<field name="view_type">form</field>
<field name="domain">[('parent_id','child_of',active_id)]</field>
<field name="context">{'parent_id':'active_id'}</field>
<field name="context">{'parent_id':active_id}</field>
</record>
<record model="ir.values" id="ir_action_document_file_directory_form">