Merge lp:~openerp-dev/openobject-addons/trunk-improve-project-visibility-another-bth into lp:openobject-addons

[Antony Lesuisse (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-improve-project-visibility-another-bth]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

Unmerged revisions

9136. By Darshan Kalola(OpenERP) on 2014-02-12

[MERGE] lp:~openerp-dev/openobject-addons/trunk-improve-project-visibility-bth.

=== modified file 'account_analytic_analysis/__openerp__.py'
--- account_analytic_analysis/__openerp__.py	2013-10-27 12:31:04 +0000
+++ account_analytic_analysis/__openerp__.py	2014-02-14 15:15:55 +0000
@@ -33,7 +33,7 @@
     'author': 'Camptocamp',
     'website': 'http://www.camptocamp.com/',
     'images': ['images/bill_tasks_works.jpeg','images/overpassed_accounts.jpeg'],
-    'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
+    'depends': ['hr_timesheet_invoice', 'sale', 'project'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
     'data': [
         'security/ir.model.access.csv',
         'security/account_analytic_analysis_security.xml',

=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2014-02-05 16:03:47 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2014-02-14 15:15:55 +0000
@@ -526,6 +526,10 @@
         'recurring_rule_type':'monthly'
     }
 
+    def create(self, cr, uid, vals, context=None):
+        vals.update({'invoice_on_timesheets': vals.get('use_timesheets', False)})
+        return super(account_analytic_account, self).create(cr, uid, vals, context=context)
+
     def open_sale_order_lines(self,cr,uid,ids,context=None):
         if context is None:
             context = {}

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2014-02-05 16:03:47 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2014-02-14 15:15:55 +0000
@@ -139,7 +139,8 @@
                         <group>
                             <field name="pricelist_id"
                                 class="oe_inline"
-                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"
+                                groups="product.group_sale_pricelist"/>
                             <field name="to_invoice"
                                 class="oe_inline"
                                 widget="selection"
@@ -336,5 +337,17 @@
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
 
+    <!-- Add analytic_account_id field in project form view -->
+        <record id="timesheet_inherit_project_analytic_account_field" model="ir.ui.view">
+            <field name="name">account.analytic.account.project.inherit</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position='after'>
+                    <field name="pricelist_id" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2014-02-10 05:26:55 +0000
+++ analytic/analytic.py	2014-02-14 15:15:55 +0000
@@ -38,7 +38,16 @@
             'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
-
+    
+    def message_get_suggested_recipients(self, cr, uid, ids, context=None):
+        recipients = super(account_analytic_account, self).message_get_suggested_recipients(cr, uid, ids, context=context)
+        for data in self.browse(cr, uid, ids, context=context):
+            if data.partner_id:
+                self._message_add_suggested_recipient(cr, uid, recipients, data, partner=data.partner_id, reason=_('Customer'))
+            elif data.partner_id.email:
+                self._message_add_suggested_recipient(cr, uid, recipients, data, email=data.partner_id.email, reason=_('Customer Email'))
+        return recipients
+    
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
         currency_obj = self.pool.get('res.currency')
         recres = {}

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2014-01-15 21:44:54 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2014-02-14 15:15:55 +0000
@@ -62,6 +62,10 @@
 
         return res
 
+    def _get_default_pricelist(self, cr, uid, context=None):
+        model, pricelist = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'product', 'list0')
+        return pricelist
+
     _inherit = "account.analytic.account"
     _columns = {
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
@@ -74,6 +78,9 @@
             help="You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sales order), you should invoice the rest on timesheet with a 80% ratio."),
     }
 
+    _defaults = {
+         'pricelist_id': _get_default_pricelist
+    }
     def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None):
         res = super(account_analytic_account, self).on_change_partner_id(cr, uid, ids, partner_id, name, context=context)
         if partner_id:

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml	2013-10-27 12:31:04 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml	2014-02-14 15:15:55 +0000
@@ -7,22 +7,18 @@
             <field name="model">hr.timesheet.invoice.create</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
-                <notebook>
-                    <page string="Billing Data">
-                       <group cols="2">
-                           <group string="Do you want to show details of work in invoice?" colspan="1" cols="2">
-                               <field name="date"/>
-                               <field name="time"/>
-                               <field name="name"/>
-                               <field name="price"/>
-                           </group>
-                           <group  string="Force to use a specific product" colspan="1" cols="2">
-                               <p class="oe_grey" colspan="2">When reinvoicing costs, the amount on the invoice lines is given by the sale price of the corresponding product (if any, and if its sale price is not 0). You can use the following field to enforce the use of a single product for all the chosen lines in the future invoices.</p>
-                               <field name="product"/>
-                           </group>
-                       </group>
-                    </page>
-                </notebook>
+                <group cols="2">
+                    <group string="Do you want to show details of work in invoice?" colspan="1" cols="2">
+                        <field name="date"/>
+                        <field name="time"/>
+                        <field name="name"/>
+                        <field name="price"/>
+                    </group>
+                    <group  string="Force to use a specific product" colspan="1" cols="2">
+                        <p class="oe_grey" colspan="2">When reinvoicing costs, the amount on the invoice lines is given by the sale price of the corresponding product (if any, and if its sale price is not 0). You can use the following field to enforce the use of a single product for all the chosen lines in the future invoices.</p>
+                        <field name="product"/>
+                    </group>
+                </group>
                 <footer>
                     <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
                     or

=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2014-01-22 09:58:26 +0000
+++ procurement/procurement_view.xml	2014-02-14 15:15:55 +0000
@@ -343,7 +343,7 @@
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                 <filter name="consumable" position="before">
-                   <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products"/>
+                   <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products" invisible="context.get('consumable_services', False)"/>
                 </filter>
             </field>
         </record>

=== modified file 'project/project.py'
--- project/project.py	2014-01-15 21:44:54 +0000
+++ project/project.py	2014-02-14 15:15:55 +0000
@@ -304,6 +304,12 @@
         'alias_model': 'project.task',
         'privacy_visibility': 'employees',
     }
+    
+    def message_get_suggested_recipients(self, cr, uid, ids, context=None):
+        res = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            res[project.id] = project.analytic_account_id.message_get_suggested_recipients(context=context)[project.analytic_account_id.id]
+        return res
 
     # TODO: Why not using a SQL contraints ?
     def _check_dates(self, cr, uid, ids, context=None):
@@ -818,6 +824,7 @@
         'user_id': lambda obj, cr, uid, ctx=None: uid,
         'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=ctx),
         'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx),
+        'date_start': fields.datetime.now,
     }
     _order = "priority, sequence, date_start, name, id"
 
@@ -1282,6 +1289,7 @@
         'use_tasks': True
     }
 
+        
 class project_task_history(osv.osv):
     """
     Tasks History, used for cumulative flow charts (Lean/Agile)

=== modified file 'project/project_demo.xml'
--- project/project_demo.xml	2013-11-27 15:32:57 +0000
+++ project/project_demo.xml	2014-02-14 15:15:55 +0000
@@ -256,6 +256,7 @@
             <field name="name">Dataflow Design</field>
             <field name="stage_id" ref="project_tt_analysis"/>
         </record>
+
         <record id="project_task_15" model="project.task">
             <field name="planned_hours" eval="55.0"/>
             <field name="remaining_hours" eval="55.0"/>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-12-24 10:29:22 +0000
+++ project/project_view.xml	2014-02-14 15:15:55 +0000
@@ -73,7 +73,7 @@
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight" groups="base.group_user"/>
                     <button name="set_done" string="Close Project" type="object" states="open,pending" groups="base.group_user"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" groups="base.group_user"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" groups="base.group_user"/>
+                    <button name="set_pending" string="Set as Pending" type="object" states="open" groups="base.group_user"/>
                     <button name="set_template" string="Set as Template" type="object" states="open" groups="base.group_user"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="base.group_user"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="base.group_user"/>
@@ -87,9 +87,9 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
-                        <div name="options_active">
+                        <div name="options_active" invisible="1">
                             <field name="use_tasks" class="oe_inline"/>
-                            <label for="use_tasks"/>
+                            <label for="use_tasks" name="use_task"/>
                         </div>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
@@ -102,11 +102,8 @@
                                     attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
                                     context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <span></span>
-                            <p 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" nolabel="1"/>.
-                            </p>
+                        </group>
+                        <group attrs="{'invisible': [('alias_domain', '!=', False)]}">
                         </group>
                         <group name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
@@ -165,7 +162,12 @@
                             </group>
                         </page>
                         <page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages">
-                             <field name="type_ids"/>
+                            <p class="oe_grey">
+                                Stages are defined globally and shared between projects.
+                                You can "configure all available stages".Stages are used to organize work in steps inside a project.
+                                In each step, you are able to change the status (validated, stopped) of the activity, no need to create specific stages for validation or blocked activities.
+                            </p>
+                            <field name="type_ids"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -262,6 +264,10 @@
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px">
                                             <t t-raw="record.task_ids.raw_value.length"/> Tasks
                                         </a>
+                                        <div t-if="record.use_tasks.raw_value and record.task_count.raw_value lt 1" style="margin-top: 6px;margin-left:20px;">
+                                            <img src="/project/static/src/img/top_left_arrow.png" style="margin-top: -8px; width: 22px;" />
+                                            <span>No activity yet, click to enter in the project.</span>
+                                        </div>
                                     </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.doc_count.raw_value" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="doc_count"/> Documents</a>
@@ -440,12 +446,15 @@
                         <page string="Extra Info">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
-                                <field name="sequence"/>
+                                <field name="sequence" groups="base.group_no_one"/>
                                 <field name="partner_id"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
                                 <group string="Gantt View">
+                                    <p class="oe_grey" colspan='2'>
+                                        Assign dates to make this task appear in the gantt chart (<span class="oe_form_gantt_avatars">y</span> icon on the top right)
+                                    </p>
                                     <field name="date_start"/>
                                     <field name="date_end"/>
                                 </group>
@@ -731,6 +740,19 @@
         <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
+         <record id="product_search_form_view_procurment_consume" model="ir.ui.view">
+            <field name="name">product.search.bom</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_search_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@string='Services']" position="replace">
+                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]" invisible="context.get('consumable_services', False)"/>
+                 </xpath>
+                 <xpath expr="//filter[@name='consumable']" position="replace">
+                     <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products" invisible="context.get('consumable_services', False)"/>
+                 </xpath>
+            </field>
+        </record>
 
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>

=== added file 'project/static/src/img/top_left_arrow.png'
Binary files project/static/src/img/top_left_arrow.png	1970-01-01 00:00:00 +0000 and project/static/src/img/top_left_arrow.png	2014-02-14 15:15:55 +0000 differ
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2013-12-02 15:09:25 +0000
+++ project_issue/project_issue.py	2014-02-14 15:15:55 +0000
@@ -210,8 +210,11 @@
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         if project_id:
             project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
-            if project and project.partner_id:
-                return {'value': {'partner_id': project.partner_id.id}}
+            if project.parent_id.type == "contract":
+                val = True 
+            else : 
+                val = False
+            return {'value': {'partner_id': project.partner_id.id, 'is_escalate': val}}
         return {}
 
     def _get_issue_task(self, cr, uid, ids, context=None):
@@ -283,6 +286,7 @@
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
+        'is_escalate': fields.boolean('Project Type'),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
             store = {
                 'project.issue': (lambda self, cr, uid, ids, c={}: ids, ['task_id'], 10),
@@ -299,6 +303,7 @@
         'kanban_state': 'normal',
         'date_last_stage_update': fields.datetime.now,
         'user_id': lambda obj, cr, uid, context: uid,
+        'is_escalate': False,
     }
 
     _group_by_full = {

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2013-11-29 09:46:10 +0000
+++ project_issue/project_issue_view.xml	2014-02-14 15:15:55 +0000
@@ -71,8 +71,8 @@
                             <label for="project_id"/>
                             <div>
                                 <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="⇒ Escalate" type="object" class="oe_link"
-                                        groups="base.group_user"/>
+                                <field name="is_escalate" invisible="1"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" class="oe_link" attrs="{'invisible':[('is_escalate','=',False)]}" groups="base.group_user"/>
                             </div>
                         </group>
                         <group>
@@ -299,6 +299,9 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+                <xpath expr='//div[@name="options_active"]' position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </xpath>
                 <xpath expr='//div[@name="options_active"]' position='inside'>
                     <field name="use_issues" class="oe_inline"
                             on_change="on_change_use_tasks_or_issues(use_tasks, use_issues)"/>
@@ -328,7 +331,7 @@
                     <field name="use_issues"/>
                     <field name="issue_ids" invisible="1"/>
                 </field>
-                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]/a" position="after">
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
                         <t t-raw="record.issue_ids.raw_value.length"/>
@@ -336,6 +339,12 @@
                         <span t-if="record.issue_ids.raw_value.length > 1">Issues</span>
                     </a>
                 </xpath>
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]/div" position="replace">
+                     <div t-if="!(record.use_tasks.raw_value and record.task_count.raw_value gt 0) and !(record.use_issues.raw_value and record.issue_count.raw_value gt 0)" style="margin-top: 6px;margin-left:20px;">
+                         <img src="/project/static/src/img/top_left_arrow.png" style="margin-top: -8px; width: 22px;" />
+                         <span>No activity yet, click to enter in the project.</span>
+                     </div>
+                </xpath>
             </field>
         </record>
 

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2013-10-27 12:31:04 +0000
+++ project_long_term/project_long_term_view.xml	2014-02-14 15:15:55 +0000
@@ -97,6 +97,9 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+                <xpath expr='//div[@name="options_active"]' position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </xpath>
                 <xpath expr="//div[@name='options_active']" position='inside'>
                        <field name="use_phases" class="oe_inline"/>
                        <label for="use_phases"/>

=== modified file 'project_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml	2013-10-27 12:31:04 +0000
+++ project_mrp/project_mrp_view.xml	2014-02-14 15:15:55 +0000
@@ -58,6 +58,34 @@
                 </group>
             </field>
         </record>
+        
+        <record id="open_service_type_products" model="ir.actions.act_window">
+            <field name="name">Services</field>
+            <field name="res_model">product.product</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_type">form</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
+            <field name="view_id" ref="product.product_kanban_view"/>
+            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_order\',\'default_supply_method\':\'produce\',\'default_sale_ok\':True,\'default_purchase_ok\':False,\'consumable_services\':True}'"/>
+            <field name="domain">[['type','=','service']]</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new service.
+              </p><p>
+                Services can be sold on quotations or sales order.
+                All services defined from this menu will create tasks when the
+                quotation is confirmed.
+              </p><p>
+                Another way to create tasks from sales is to use template of contracts
+                linked to a project having pre-defined tasks that will be duplicated 
+                per contract reusing this project.
+              </p>
+            </field>
+        </record>
+
+        <menuitem id="menu_products_projects" name="Products" parent="base.menu_main_pm" sequence="3" />
+        <menuitem action="open_service_type_products" id="menu_products_services" name="Services" parent="menu_products_projects" sequence="1" />
+        
     </data>
 </openerp>
 

=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2013-10-27 12:31:04 +0000
+++ project_mrp/project_procurement.py	2014-02-14 15:15:55 +0000
@@ -79,7 +79,7 @@
                 'partner_id': procurement.sale_line_id and procurement.sale_line_id.order_id.partner_id.id or False,
                 'user_id': procurement.product_id.product_manager.id,
                 'procurement_id': procurement.id,
-                'description': procurement.name + '\n' + (procurement.note or ''),
+                'description': (procurement.note or ''),
                 'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
             },context=context)

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2013-10-27 12:31:04 +0000
+++ project_timesheet/project_timesheet_view.xml	2014-02-14 15:15:55 +0000
@@ -13,7 +13,7 @@
                     <field name="currency_id"/>
                     <field name="partner_id"/>
                 </field>
-                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
+                <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]/a" position="after">
                     <a t-if="record.use_timesheets.raw_value" style="margin-right: 10px"
                         name="open_timesheets" type="object"><field name="hours_quantity"/> Hours</a>
                 </xpath>
@@ -25,10 +25,21 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+                <xpath expr='//div[@name="options_active"]' position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </xpath>
                 <xpath expr='//div[@name="options_active"]' position='inside'>
                     <field name="use_timesheets" class="oe_inline"/>
                     <label for="use_timesheets"/>
                 </xpath>
+                <xpath expr='//field[@name="partner_id"]' position='after'>
+                    <group colspan="2">
+                        <p 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" nolabel="1"/>.
+                        </p>
+                    </group>
+                </xpath>
                 <xpath expr='//div[@name="buttons"]' position="inside">
                     <button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
                 </xpath>