X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fanalytic%2Fanalytic_view.xml;h=1277d25de711d89a6ece1dcc2cedf962dae834aa;hb=f94f396d0420accd08d9fa1720f21da8fd36732e;hp=c1e59cf3ba3fda453eda1a2a6881e9c12ea40e2d;hpb=254489e168e060f789f02d17453ce34fef7fb9cc;p=odoo%2Fodoo.git

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c1e59cf..1277d25 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,19 +8,26 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
+
+                        <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                        </h1>
-                        <div name="project"/>
-                        <group>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                            </h1>
+                            <div name="project"/>
+                        </div>
+
+                        <group name="main">
                             <group>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/>
                                 <field name="manager_id"/>
-                                <field name="code"/>
+                                <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
-                                <field name="type"/>
+                                <field name="code"/>
+                                <field name="type" invisible="context.get('default_type', False)"/>
                                 <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
@@ -32,9 +39,12 @@
                                     <p colspan="2" class="oe_grey oe_edit_only">
                                         Once the end date of the contract is
                                         passed or the maximum number of service
-                                        units is reached, the account manager
-                                        is warned by email to renew the contract.
+                                        units (e.g. support contract) is
+                                        reached, the account manager is notified 
+                                        by email to renew the contract with the
+                                        customer.
                                     </p>
+                                    <field name="date_start"/>
                                     <label for="date" string="End Date"/>
                                     <div name="duration">
                                         <field name="date" class="oe_inline"/>
@@ -46,8 +56,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>