[IMP]:contract,analytic_project,analytic_hr_expense: improve whole contract view...

[odoo/odoo.git] / addons / analytic / analytic_view.xml

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 4ef37e8..a606209 100644 (file)
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -7,32 +7,38 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form  layout="manual">
-                    <sheet string="Analytic account" layout="auto">
+                <form version="7.0">
+                    <sheet string="Analytic account" >
                         <group colspan="4" col="4" class="oe_form_group_label_border">
-                            <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <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="user_id"/>
+                            <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" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                            <field name="type"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">
                             <page string="Contract Information" name="contract_page">
-                                <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Validity"/>
-                                    <field name="date_start"/>
-                                    <field name="date"/>
+                                <group col="4" colspan="4">
+                                    <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
+                                        <separator colspan="2" string="Validity"/>
+                                        <field name="date_start"/>
+                                        <field name="date"/>
+                                    </group>
+                                    <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
+                                        <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                    </group>
+                                     <group name="toinvoice" colspan="4" col="4"></group>
                                 </group>
-                                <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
-                                </group>
-                                <separator string="Terms and Condition" colspan="4" name="description"/>
+                                <separator string="Terms and Conditions" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
                         </notebook>
                     </sheet>
+                    <div class="oe_form_bottom">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>