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

[Chirag Dodiya(OpenERP)]

Hello,

      I have improved some view:project form view,Task form view ,project kaban view, Contract form view and payment,and Chatter of project form view.

Thanks,
cod

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

9374. By Chirag Dodiya(OpenERP) on 2014-04-24

[REM]Revert code for <p> tag

9375. By Chirag Dodiya(OpenERP) on 2014-04-24

[IMP]Improved code for <p> tag

9376. By Chirag Dodiya(OpenERP) on 2014-04-24

[IMP]moved <p> tag in project timesheet module

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Do we want to add dependency of project in account_analytic_analysis module. If no you can move the code line number 46 to 57 in diff to project module. Since pricelist_id field can be invisible there (no need to add extra dependency.)

changes line number 115 to 125 seems working in latest branch. please check.

Regards,

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

9377. By Chirag Dodiya(OpenERP) on 2014-04-24

[IMP]Improved code for timesheet/issue/phases to hide respected buttons and added css class for gantt view icon.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

> Do we want to add dependency of project in account_analytic_analysis module.
> If no you can move the code line number 46 to 57 in diff to project module.
> Since pricelist_id field can be invisible there (no need to add extra
> dependency.)

Change: We can add pricelist_id field in project.project since project is depend on product, this will remove adding dependancy of project in account_analytic_analysis module.

>
> changes line number 115 to 125 seems working in latest branch. please check.
>
> Regards,

review: Needs Fixing

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

9378. By Chirag Dodiya(OpenERP) on 2014-04-25

[IMP]Moved pricelist_id field in project module and removed depandancy

9379. By Chirag Dodiya(OpenERP) on 2014-04-25

[MRG]Merge with lp:openobejct-addons

9380. By Chirag Dodiya(OpenERP) on 2014-04-28

[MRG]Merged with lp:openobject-addons

9381. By Chirag Dodiya(OpenERP) on 2014-04-29

[IMP]Improved task form view,improved condition for issue and improved domain

9382. By Chirag Dodiya(OpenERP) on 2014-04-29

[MRG]Merged with lp:openobject-addons

9383. By Chirag Dodiya(OpenERP) on 2014-05-01

[MRG]Merged with lp:openobjet-addons

9384. By Chirag Dodiya(OpenERP) on 2014-05-06

[IMP]Removed create method and puted onchange on use timesheets field

9385. By Chirag Dodiya(OpenERP) on 2014-05-06

[MRG]Merged with lp:openobject-addons

9386. By Chirag Dodiya(OpenERP) on 2014-05-06

[IMP]Removed pricelist_id field,improved xpath,improved indentation,improved code of on_change_project

9387. By Chirag Dodiya(OpenERP) on 2014-05-06

[IMP]Improved context in service action and improved indentation

9388. By Chirag Dodiya(OpenERP) on 2014-05-08

[IMP]Improved code to set default pricelist and removed some unused code for that

9389. By Chirag Dodiya(OpenERP) on 2014-05-08

[MRG]Merged with lp:openobject-addons

9390. By Chirag Dodiya(OpenERP) on 2014-05-09

[REM]Removed message_get_suggested_recipients method from analytic and puted in project

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Minor improvement.
product.search.bom => product.product.service.search

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

9391. By Chirag Dodiya(OpenERP) on 2014-05-09

[MRG]Merged with lp:openobject-addons

9392. By Chirag Dodiya(OpenERP) on 2014-05-09

[REM]Removed unused file

9393. By Chirag Dodiya(OpenERP) on 2014-05-09

[IMP]Improved name with product.product.service.search in project_view.xm

9394. By Chirag Dodiya(OpenERP) on 2014-05-16

[MRG]Merged with lp:openobject-addons

Unmerged revisions

9394. By Chirag Dodiya(OpenERP) on 2014-05-16

[MRG]Merged with lp:openobject-addons

9393. By Chirag Dodiya(OpenERP) on 2014-05-09

[IMP]Improved name with product.product.service.search in project_view.xm

9392. By Chirag Dodiya(OpenERP) on 2014-05-09

[REM]Removed unused file

9391. By Chirag Dodiya(OpenERP) on 2014-05-09

[MRG]Merged with lp:openobject-addons

9390. By Chirag Dodiya(OpenERP) on 2014-05-09

[REM]Removed message_get_suggested_recipients method from analytic and puted in project

9389. By Chirag Dodiya(OpenERP) on 2014-05-08

[MRG]Merged with lp:openobject-addons

9388. By Chirag Dodiya(OpenERP) on 2014-05-08

[IMP]Improved code to set default pricelist and removed some unused code for that

9387. By Chirag Dodiya(OpenERP) on 2014-05-06

[IMP]Improved context in service action and improved indentation

9386. By Chirag Dodiya(OpenERP) on 2014-05-06

[IMP]Removed pricelist_id field,improved xpath,improved indentation,improved code of on_change_project

9385. By Chirag Dodiya(OpenERP) on 2014-05-06

[MRG]Merged with lp:openobject-addons

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2014-05-08 08:39:48 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2014-05-16 11:16:00 +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"

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2014-04-01 12:36:57 +0000
+++ analytic/analytic.py	2014-05-16 11:16:00 +0000
@@ -38,7 +38,7 @@
             'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
-
+    
     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-05-16 11:16:00 +0000
@@ -74,6 +74,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': lambda self, cr, uid, c: self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'list0')[1]
+    }
     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-05-16 11:16:00 +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 'product/product_view.xml'
--- product/product_view.xml	2014-04-25 09:04:14 +0000
+++ product/product_view.xml	2014-05-16 11:16:00 +0000
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|','|',('name','ilike',self),('default_code','ilike',self),('variants','ilike',self)]"/>
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
+                   <filter string="Services" name="services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
                    <separator/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>

=== modified file 'project/project.py'
--- project/project.py	2014-05-13 11:18:37 +0000
+++ project/project.py	2014-05-16 11:16:00 +0000
@@ -296,6 +296,14 @@
         'alias_model': 'project.task',
         'privacy_visibility': 'employees',
     }
+    
+    def message_get_suggested_recipients(self, cr, uid, ids, context=None):
+        recipients = super(project, self).message_get_suggested_recipients(cr, uid, ids, context=context)
+        for data in self.browse(cr, uid, ids, context=context):
+            if data.partner_id:
+                vals = 'Customer Email' if data.partner_id.email else 'Customer'
+                self._message_add_suggested_recipient(cr, uid, recipients, data, partner=data.partner_id, reason=_('%s')% vals)
+        return recipients
 
     # TODO: Why not using a SQL contraints ?
     def _check_dates(self, cr, uid, ids, context=None):
@@ -807,6 +815,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"
     

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2014-05-08 15:34:32 +0000
+++ project/project_view.xml	2014-05-16 11:16:00 +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">
@@ -109,10 +109,6 @@
                             <newline/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                         </group>
-                            <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 name="group_alias"
                                 attrs="{'invisible': [('alias_domain', '=', False)]}">
                             <label for="alias_name" string="Email Alias"/>
@@ -160,7 +156,7 @@
                                 <field name="resource_calendar_id"
                                         groups="project.group_time_work_estimation_tasks"/>
                             </group>
-                            <group string="Miscellaneous" name="misc">
+                            <group name="misc">
                                 <field name="date_start"/>
                                 <field name="date" string="End Date"/>
                                 <field name="sequence" groups="base.group_no_one"/>
@@ -170,7 +166,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>
@@ -267,6 +268,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>
@@ -447,15 +452,16 @@
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="date_last_stage_update" groups="base.group_no_one"/>
                             </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"></span> icon on the top right)
+                                    </p>
                                     <field name="date_start"/>
                                     <field name="date_end"/>
                                 </group>
-                                <group>
-                                    <field name="date_last_stage_update" groups="base.group_no_one"/>
-                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -732,6 +738,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.product.service.search</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[@name='services']" position="replace">
+                    <filter string="Services" name="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>

=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css	2013-10-27 12:31:04 +0000
+++ project/static/src/css/project.css	2014-05-16 11:16:00 +0000
@@ -61,5 +61,12 @@
     -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-
+.oe_form_gantt_avatars:after {
+  font-family: "mnmliconsRegular" !important;
+  font-size: 21px;
+  font-weight: 300 !important;
+  content: "y";
+  top: 3px;
+  position: relative;
+}
 

=== 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-05-16 11:16:00 +0000 differ
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2014-05-08 15:25:36 +0000
+++ project_issue/project_issue.py	2014-05-16 11:16:00 +0000
@@ -213,7 +213,8 @@
         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}}
+                val = True if project.parent_id.type == 'contract' else False
+            return {'value': {'partner_id': project.partner_id.id, 'is_escalate': val}}
         return {}
 
     def _get_issue_task(self, cr, uid, ids, context=None):
@@ -284,6 +285,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),
@@ -300,6 +302,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	2014-05-08 15:34:32 +0000
+++ project_issue/project_issue_view.xml	2014-05-16 11:16:00 +0000
@@ -70,8 +70,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>
@@ -280,13 +280,16 @@
             <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)"/>
                     <label for="use_issues"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
-                    <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', 0)]}" 
+                    <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', False)]}" 
                         name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
                         <field string="Issues" name="issue_count" widget="statinfo"/>
                     </button>
@@ -312,14 +315,20 @@
                     <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"/>
-                        <span t-if="record.issue_ids.raw_value.length == 1">Issue</span>
+                        <span t-if="record.issue_ids.raw_value.length &lt;= 1">Issue</span>
                         <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_ids.raw_value.length 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_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml	2013-12-20 10:33:33 +0000
+++ project_mrp/project_mrp_view.xml	2014-05-16 11:16:00 +0000
@@ -44,6 +44,31 @@
                 </field>
             </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">{'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>
+            <field name="domain">[('type','=','service'),('procure_method','=','make_to_order'),('supply_method','=','produce'),('sale_ok','=',True)]</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_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2013-10-27 12:31:04 +0000
+++ project_timesheet/project_timesheet.py	2014-05-16 11:16:00 +0000
@@ -38,6 +38,9 @@
                 factor_id = data_obj.browse(cr, uid, data_id).res_id
                 res['value'].update({'to_invoice': factor_id})
         return res
+        
+    def onchange_use_timesheets(self, cr, uid, ids, use_timesheets, context=None):
+        return {'value':{'invoice_on_timesheets': use_timesheets}}
 
     _defaults = {
         'use_timesheets': True,

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2014-04-15 12:57:15 +0000
+++ project_timesheet/project_timesheet_view.xml	2014-05-16 11:16:00 +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,12 +25,24 @@
             <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"/>
+                    <field name="invoice_on_timesheets" invisible="1"/>
+                    <field name="use_timesheets" class="oe_inline" on_change="onchange_use_timesheets(use_timesheets)"/>
                     <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 class="oe_inline oe_stat_button" name="open_timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"
+                    <button class="oe_inline oe_stat_button" name="open_timesheets" type="object" attrs="{'invisible':[('use_timesheets','=',False)]}"
                         icon="fa-calendar" string="Timesheets"/>
                 </xpath>
             </field>