diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b1ef852f12f..7678dc59f75 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -30,18 +30,18 @@
                     <separator name="toinvoice" string="Invoicing"/>
                     <table class="oe_form_analytic_account">
                         <tr>
-                            <th class="oe_grey" width="160px"></th>
-                            <th class="oe_grey" width="25px"></th>
-                            <th class="oe_grey" width="100px"><label string="Expected"/></th>
-                            <th class="oe_grey" width="100px"><label string="Invoiced"/></th>
-                            <th class="oe_grey" width="100px"><label string="Remaining"/></th>
-                            <th class="oe_grey" width="100px"><label string="To Invoice"/></th>
+                            <th class="oe_timesheet_grey" width="160px"></th>
+                            <th class="oe_timesheet_grey" width="25px"></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="To Invoice"/></th>
                             <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
@@ -51,23 +51,28 @@
                                 <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="open_sale_order_lines"
-                                    class="oe_link oe_e"
-                                    string="/" type="object"
-                                    context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"
-                                    attrs="{'invisible': [('fix_price_to_invoice','=',0)]}"/>
-                            </td><td>
+                            </td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                                <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="open_sale_order_lines"
+                                        class="oe_link"
+                                        string="⇒ Invoice" type="object"
+                                        context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
+                                    or view
+                                </span>
+
+                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No order to invoice, view
+                                </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                    />
                             </td>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -77,31 +82,34 @@
                                 <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
-                                    type="action"
-                                    class="oe_link oe_e"
-                                    string="/"
-                                    attrs="{'invisible': [('ca_to_invoice','=',0.0)]}"/>
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                                <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
+                                        type="action"
+                                        class="oe_link"
+                                        string="⇒ Invoice"/>
+                                    or view 
+                                </span>
+                                <div attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No hours to invoice, create 
+                                </div>
 
-                            </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
                                     string="Timesheets" type="action"
                                     class="oe_link"
-                                    attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"
                                     context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th class="oe_grey">
+                            <th class="oe_timesheet_grey">
                                 <label string="Total"/>
-                            </th><td class="oe_grey">
-                            </td><td class="oe_grey">
+                            </th><td class="oe_timesheet_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
index c6513cc6321..f3e4785de9f 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.css
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -9,7 +9,11 @@
   float: right;
   width: auto !important;
 }
-.openerp .oe_form table.oe_form_analytic_account .oe_grey {
+.openerp .oe_form table.oe_form_analytic_account tr td.oe_timesheet_action {
+  width: 250px;
+  padding-left: 7px;
+}
+.openerp .oe_form table.oe_form_analytic_account .oe_timesheet_grey {
   background-color: #eeeeee;
   color: #404040;
 }
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.sass b/addons/account_analytic_analysis/static/src/css/analytic.sass
index 1db81fb61b9..a7065e00f18 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.sass
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -9,7 +9,10 @@
                 .oe_form_field_float
                     float: right
                     width: auto !important
-        .oe_grey
+            td.oe_timesheet_action
+                width: 250px
+                padding-left: 7px
+        .oe_timesheet_grey
             background-color: #eeeeee
             color: #404040
         
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0bb009e72b0..4d3296866b4 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -21,7 +21,7 @@
 
                         <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)]}"/>
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 8d0f470df86..bef0321a7c1 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>
-                        <td class="oe_grey">
+                        <td class="oe_timesheet_grey">
                             <label for="charge_expenses"/>
-                        </td><td class="oe_grey">
+                        </td><td class="oe_timesheet_grey">
                             <field name="charge_expenses"/>
                         </td><td>
                             <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
@@ -21,17 +21,22 @@
                             <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <button
-                                name="hr_to_invoice_expense"
-                                class="oe_link oe_e"
-                                string="/" type="object"
-                                attrs="{'invisible': [('expense_to_invoice','=',0)]}"/>
-                        </td><td>
+                        </td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
+                            <span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
+                                <button
+                                    name="hr_to_invoice_expense"
+                                    class="oe_link"
+                                    string="⇒ Invoice" type="object"
+                                    />
+                                of view
+                            </span>
+                            <span attrs="{'invisible': [('expense_to_invoice','&lt;&gt;',0)]}" class="oe_grey">
+                                None to invoice, create 
+                            </span>
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                                string="Expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 08ea2881d4d..c1d4b1d3d45 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -97,7 +97,9 @@
                         </group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <field name="analytic_account_id" readonly="1" required="0" attrs="{'invisible': [('analytic_account_id','=',False)]}"/>
+                            <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
+                            </p>
                         </group>
                     </group>
                     <notebook>