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

[Paramjit Singh Sahota(OpenERP)]

Hello,

Improved code as suggested.

Thanks.

[Josse Colpaert (OpenERP) (jco-openerp)]

- It is not really amusing to find a diff with lots of lines where a space is the only difference.
- It is Gantt, not gnat for the oe_... (minor)
- "When you come from project, the default pricelist should be the one of customer": this should not be done by inheriting the create method, but by using the defaults. Because now, the user is going to type something and the system is going to override it without warning.
- In def message_get_suggested_recipients(self, cr, uid, ids, context=None): I don't think a project has an email_from

review: Needs Fixing

[Bhumi Thakkar (Open ERP) (bth-openerp)]

=> Remove spaces.
=> Modify gnatt to gantt
=> by using the defaults set the value of pricelist_id
=> email_from to email in project for chatter in def message_get_suggested_recipients method.

review: Needs Resubmitting

[qdp (OpenERP) (qdp)]

1) + 'pricelist_id': lambda self, cr, uid, c: self.pool.get('res.partner').browse(cr, uid, uid, c).property_product_pricelist.id

this is completly wrong. you're fetching a partner object by giving a user id 'uid'! You must browse the partner_id field on res.users. So the correct code was:
+ 'pricelist_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).partner_id.property_product_pricelist.id

(BTW, i'm not sure this will work if the partner doesn't have any pricelist set.)

2) it's too weird having message_get_suggested_recipients overwritten twice with exactly the same code. You should try to factorize. Can't you just
*leave as it in project
*in analytic account: return the project's results in case there is a project related

3) for the class oe_form_gantt_avatars, it would be better to define it more globally, as gantt view are not dedicated only to projects

review: Needs Fixing

[Bhumi Thakkar (Open ERP) (bth-openerp)]

I improved code for pricelist_id and checkbox of customer in chatter in project and contract module.

review: Needs Resubmitting

[Bhumi Thakkar (Open ERP) (bth-openerp)]

For the gantt icon, i make it global/generic as you suggested that is in https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-project-visibility-bth branch.

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

Few comments:

- We should move get_default_pricelist method in hr_timesheet_invoice module since the field pricelist_id define on it.
- Improve create method.
- Do not add new search view for product you can use existing.

Thanks,
Mustufa Rangwala

review: Needs Fixing

[Bhumi Thakkar (Open ERP) (bth-openerp)]

Improved code as per your suggestion.

review: Needs Resubmitting

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

Remove conflicts.

[Bhumi Thakkar (Open ERP) (bth-openerp)]

Merge latest trunk and resolve conflicts.

review: Needs Resubmitting

[Priyesh (OpenERP) (pso-openerp)]

Hello,

Thanks for your changes. Few points, which should be improve :

1. Right now, When you save any project, By default in Contract, its coming with Default Pricelist. But If Customer is present in Project, then it should first come up with Customer's Sales Pricelist.
2. Keep get_default_pricelist as private by using _ like _get_default_pricelist().

Thanks,
Priyesh Solanki

review: Needs Fixing

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

8691. By Paramjit Singh Sahota(OpenERP) on 2013-05-24

[MERGE] Merged lp:openobject-addons.

8692. By Bhumi Thakkar (Open ERP) on 2013-06-03

[MERGE] Merge lp:openobject-addons.

8693. By Bhumi Thakkar (Open ERP) on 2013-06-03

[FIX]hide only in project=>products=>services menu.

8694. By Bhumi Thakkar (Open ERP) on 2013-06-03

[IMP] Product is hidden in searchview.

8695. By Bhumi Thakkar (Open ERP) on 2013-06-03

[IMP]Modify id.

8696. By Bhumi Thakkar (Open ERP) on 2013-06-04

[IMP]products filter hide.

8697. By Bhumi Thakkar (Open ERP) on 2013-06-04

[IMP]Improve code.

8698. By Bhumi Thakkar (Open ERP) on 2013-06-05

[MERGE]Merge lp:openobject-addons.

8699. By Bhumi Thakkar (Open ERP) on 2013-06-10

[MERGE]Merge lp:openobject-addons.

8700. By Bhumi Thakkar (Open ERP) on 2013-06-11

[REN]Rename name.

8701. By Bhumi Thakkar (Open ERP) on 2013-06-12

[MERGE]Merge lp:openobject-addons.

8702. By Jignesh Rathod(OpenERP) on 2013-06-17

merge with addons.

8703. By Jignesh Rathod(OpenERP) on 2013-06-19

Move menu in project_mrp and change message in gray.

8704. By Bhumi Thakkar (Open ERP) on 2013-06-24

[MERGE]Merge lp;openobject-addons.

8705. By Bhumi Thakkar (Open ERP) on 2013-07-15

[MERGE]Merge lp:openobject-addons.

8706. By Bhumi Thakkar (Open ERP) on 2013-07-15

[FIX]Removed conflicts.

8707. By Bhumi Thakkar (Open ERP) on 2013-08-08

[MERGE]Merge lp:openobject-addons.

8708. By Bhumi Thakkar (Open ERP) on 2013-08-08

[REM]Remove line.

8709. By Bhumi Thakkar (Open ERP) on 2013-08-13

[IMP]Improved changes.

8710. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openobject-addons.

8711. By Bhumi Thakkar (Open ERP) on 2013-08-22

[MERGE]Merge lp:openobject-addons.

8712. By Bhumi Thakkar (Open ERP) on 2013-08-22

[IMP]Improve code.

8713. By Bhumi Thakkar (Open ERP) on 2013-08-22

[MERGE]Merge lp:openobject-addons.

8714. By Bhumi Thakkar (Open ERP) on 2013-08-26

[MERGE]Merge lp:openobject-addons.

8715. By Bhumi Thakkar (Open ERP) on 2013-08-26

[IMP]Improved code for message for activity instead of separate.

8716. By Bhumi Thakkar (Open ERP) on 2013-08-26

[IMP]IMproved for project_timesheet.

8717. By Bhumi Thakkar (Open ERP) on 2013-09-19

[MERGE]Merge trunk.

8718. By Bhumi Thakkar (Open ERP) on 2013-09-19

[IMP]Checkbox task is hide when only project is installed, 'a' is small in activity word, escalation button is displayed when parent of project is there.

8719. By Bhumi Thakkar (Open ERP) on 2013-09-20

[MERGE]Merge trunk.

8720. By Bhumi Thakkar (Open ERP) on 2013-09-23

[IMP]Improved condition for issue message.

8721. By Bhumi Thakkar (Open ERP) on 2013-09-23

[MERGE]Merge trunk.

8722. By Bhumi Thakkar (Open ERP) on 2013-09-23

[IMP]Improved condition.

8723. By Bhumi Thakkar (Open ERP) on 2013-10-01

[MERGE]Merge lp:openobject-addons.

8724. By Bhumi Thakkar (Open ERP) on 2013-10-01

[IMP]Removed onchange.

8725. By Bhumi Thakkar (Open ERP) on 2013-10-01

[IMP]Rename project_type to is_escalate and working now.

8726. By Bhumi Thakkar (Open ERP) on 2013-10-04

[MERGE]Merge trunk.

8727. By Bhumi Thakkar (Open ERP) on 2013-10-04

[IMP]Improved condition.

8728. By Bhumi Thakkar (Open ERP) on 2013-10-07

[MERGE]Merge trunk.

8729. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

8730. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

Unmerged revisions

8730. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

8729. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

8728. By Bhumi Thakkar (Open ERP) on 2013-10-07

[MERGE]Merge trunk.

8727. By Bhumi Thakkar (Open ERP) on 2013-10-04

[IMP]Improved condition.

8726. By Bhumi Thakkar (Open ERP) on 2013-10-04

[MERGE]Merge trunk.

8725. By Bhumi Thakkar (Open ERP) on 2013-10-01

[IMP]Rename project_type to is_escalate and working now.

8724. By Bhumi Thakkar (Open ERP) on 2013-10-01

[IMP]Removed onchange.

8723. By Bhumi Thakkar (Open ERP) on 2013-10-01

[MERGE]Merge lp:openobject-addons.

8722. By Bhumi Thakkar (Open ERP) on 2013-09-23

[IMP]Improved condition.

8721. By Bhumi Thakkar (Open ERP) on 2013-09-23

[MERGE]Merge trunk.

=== modified file 'account_analytic_analysis/__openerp__.py'
--- account_analytic_analysis/__openerp__.py	2013-03-01 08:36:10 +0000
+++ account_analytic_analysis/__openerp__.py	2013-11-11 13:30:53 +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	2013-10-03 11:12:22 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2013-11-11 13:30:53 +0000
@@ -525,6 +525,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	2013-09-04 14:10:53 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2013-11-11 13:30:53 +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	2013-09-10 12:48:03 +0000
+++ analytic/analytic.py	2013-11-11 13:30:53 +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	2013-08-20 16:52:58 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2013-11-11 13:30:53 +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)
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml	2013-03-19 12:50:28 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml	2013-11-11 13:30:53 +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	2013-09-04 14:10:53 +0000
+++ procurement/procurement_view.xml	2013-11-11 13:30:53 +0000
@@ -309,7 +309,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	2013-09-19 14:23:38 +0000
+++ project/project.py	2013-11-11 13:30:53 +0000
@@ -300,6 +300,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):
@@ -813,6 +819,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"
 
@@ -1276,6 +1283,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-07-19 10:01:19 +0000
+++ project/project_demo.xml	2013-11-11 13:30:53 +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-10-08 13:56:50 +0000
+++ project/project_view.xml	2013-11-11 13:30:53 +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 @@
                                             <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
                                             <span t-if="record.task_count.raw_value lt 2"><field name="task_count"/> Task</span>
                                         </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>
@@ -439,12 +445,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	2013-11-11 13:30:53 +0000 differ
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2013-10-15 14:13:55 +0000
+++ project_issue/project_issue.py	2013-11-11 13:30:53 +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-10-17 11:35:03 +0000
+++ project_issue/project_issue_view.xml	2013-11-11 13:30:53 +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>
@@ -298,6 +298,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)"/>
@@ -327,13 +330,19 @@
                     <field name="use_issues"/>
                     <field name="issue_count" 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">
                         <span t-if="record.issue_count.raw_value gt 1"><field name="issue_count"/> Issues</span>
                         <span t-if="record.issue_count.raw_value lt 2"><field name="issue_count"/> Issue</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-09-04 14:11:22 +0000
+++ project_long_term/project_long_term_view.xml	2013-11-11 13:30:53 +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-07-19 10:01:19 +0000
+++ project_mrp/project_mrp_view.xml	2013-11-11 13:30:53 +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-07-19 10:01:19 +0000
+++ project_mrp/project_procurement.py	2013-11-11 13:30:53 +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-06-07 16:09:27 +0000
+++ project_timesheet/project_timesheet_view.xml	2013-11-11 13:30:53 +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>