[MERGE] merge with main addons

[odoo/odoo.git] / addons / document / document_view.xml

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 20a72c9..2f92db1 100644 (file)
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -69,7 +69,7 @@
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Directories" col="4">
+            <form string="Directories" col="4" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="parent_id"/>
@@ -238,47 +238,49 @@
         <field name="priority" eval="1"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Documents">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Attachment">
-                    <group>
-                        <group string="Data">
-                            <field name="type"/>
-                            <newline />
-                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                        </group>
+            <form string="Documents" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Attachment">
                         <group>
-                            <field name="res_id" invisible="True"/>
-                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <separator string="Related to" colspan="2"/>
-                            <field name="partner_id"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Created">
-                            <field name="create_uid" readonly="1"/>
-                            <field name="create_date" readonly="1"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Modified">
-                            <field name="write_uid" readonly="1"/>
-                            <field name="write_date" readonly="1"/>
+                            <group string="Data">
+                                <field name="type"/>
+                                <newline />
+                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
+                            </group>
+                            <group>
+                                <field name="res_id" invisible="True"/>
+                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <separator string="Related to" colspan="2"/>
+                                <field name="partner_id"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Created">
+                                <field name="create_uid" readonly="1"/>
+                                <field name="create_date" readonly="1"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Modified">
+                                <field name="write_uid" readonly="1"/>
+                                <field name="write_date" readonly="1"/>
+                            </group>
                         </group>
-                    </group>
-                </page>
-                <page string="Indexed Content - experimental" groups="base.group_no_one">
-                    <field name="index_content"/>
-                </page>
-                <page string="Notes">
-                    <field name="description"/>
-                </page>
-                </notebook>
+                    </page>
+                    <page string="Indexed Content - experimental" groups="base.group_no_one">
+                        <field name="index_content"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="description"/>
+                    </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>