[MERGE] merged from trunk main addons branch

bzr revid: vra@tinyerp.com-20100514044836-q9iucv080zovjqkd
2010-05-14 10:18:36 +05:30
parent 80da473c81
commit f2638bb616
213 changed files with 12381 additions and 9847 deletions
@@ -118,8 +118,7 @@
    <record model="ir.ui.view" id="view_document_directory_tree">
        <field name="name">document.directory</field>
        <field name="model">document.directory</field>
-        <field name="type">tree</field>
-        <field name="field_parent">child_ids</field>
+        <field name="type">tree</field>        
        <field name="arch" type="xml">
            <tree string="Directories" toolbar="1">
                <field name="name"/>