X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fanalytic%2Fanalytic_view.xml;h=f19eaf114f4fb0a7adac9f32c28364eefed5d449;hb=4c2541d7a363a372cf7c08e5c3bc14da8a7fc8f5;hp=3f37d5ec24625d2cf7eab18a7526b018bfc0d979;hpb=66c3093feef8df9c21f34fa1aea402087dd3c7ea;p=odoo%2Fodoo.git

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 3f37d5e..f19eaf1 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,36 +8,42 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <sheet string="Analytic account" >
-                        <group colspan="4" col="4" class="oe_form_group_label_border">
+                    <sheet string="Analytic Account">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
                             <field name="name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','!=','template')]}"/>
-                            <field name="code"/>
-                            <field name="manager_id"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="type"/>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="manager_id"/>
+                                <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
+                            </group>
                         </group>
-                        <notebook colspan="4">
-                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','=','view')]}">
-                                <group>
+                        <notebook>
+                            <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
+                                <group name="master">
                                     <group string="Validity" name="contract">
                                         <field name="date_start"/>
                                         <field name="date"/>
                                     </group>
                                     <group name="project">
-                                        <separator colspan="2" string="Project Management" name="project_sep" invisible="1"/>
+                                        <separator string="Project Management" name="project_sep" invisible="1"/>
                                     </group>
-                                     <group name="toinvoice"></group>
                                 </group>
-                                <separator string="Terms and Conditions" colspan="4" name="description"/>
-                                <field colspan="4" name="description" nolabel="1"/>
+                                <separator string="Terms and Conditions" name="description"/>
+                                <field name="description"/>
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_form_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>