From 9e037ba34fd08d6efa667420e6a654e0f5ddef9d Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 4 Mar 2013 12:53:41 +0530
Subject: [PATCH 01/16] [IMP]  in contract no order to invoice string shoud be
 seen until sale order is not confirmed

bzr revid: fka@tinyerp.com-20130304072341-uo0b9ibjp2sehyrd
---
 addons/account_analytic_analysis/account_analytic_analysis.py   | 2 +-
 .../account_analytic_analysis_view.xml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 708c4b56629..27407423aad 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -295,7 +295,7 @@ class account_analytic_account(osv.osv):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = 0.0
-            sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id)], context=context)
+            sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id), ('state', '=', 'manual')], context=context)
             for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
                 if not sale.invoiced:
                     res[account.id] += sale.amount_untaxed
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 50cdaff44d1..64068edab26 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -57,7 +57,7 @@
                                 <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
                                     <button name="open_sale_order_lines"
                                         class="oe_link"
-                                        string="⇒ Invoice" type="object"
+                                        string="⇒ To invoice" type="object"
                                         context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
                                     or view
                                 </span>

From 4f00199aaa761b5ce4e1be9a78fde765896c1153 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 4 Mar 2013 14:06:52 +0530
Subject: [PATCH 02/16] [IMP]  change string of date & put start date before
 end date in list view

bzr revid: fka@tinyerp.com-20130304083652-3coo0jeou5lde1z3
---
 addons/account/project/project_view.xml                         | 2 +-
 .../account_analytic_analysis_view.xml                          | 2 +-
 addons/analytic/analytic.py                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 175a227a9ea..62c8fb37075 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -11,8 +11,8 @@
                     <field name="complete_name"/>
                     <field name="partner_id"/>
                     <field name="code"/>
-                    <field name="date"/>
                     <field name="date_start"/>
+                    <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="manager_id"/>
                     <field name="parent_id" invisible="1"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 64068edab26..38836b7fcbd 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -157,7 +157,7 @@
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
             <field name="arch" type="xml">
-                <field name="date" position="before">
+                <field name="date_start" position="before">
                     <field name="last_invoice_date"/>
                     <field name="toinvoice_total"/>
                     <field name="remaining_hours"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 85e21d5fbc5..42651acb0c6 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -194,7 +194,7 @@ class account_analytic_account(osv.osv):
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Start Date'),
-        'date': fields.date('Date End', select=True),
+        'date': fields.date('End Date', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'),('pending','To Renew'),('close','Closed'),('cancelled', 'Cancelled')], 'Status', required=True, track_visibility='onchange'),
         'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company

From af5969508acb2bc8d135354e6e346dfd7cc98e54 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 4 Mar 2013 16:29:18 +0530
Subject: [PATCH 03/16] [IMP] if directly  create a so and invoice, from the SO
 it not display in contract

bzr revid: fka@tinyerp.com-20130304105918-vblu28tisjnbdt0h
---
 addons/account_analytic_analysis/account_analytic_analysis.py   | 2 +-
 .../account_analytic_analysis_view.xml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 27407423aad..723752db384 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -295,7 +295,7 @@ class account_analytic_account(osv.osv):
         res = {}
         for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = 0.0
-            sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id), ('state', '=', 'manual')], context=context)
+            sale_ids = sale_obj.search(cr, uid, ['|', ('project_id','=', account.id), ('partner_id', '=', account.partner_id.id), ('state', '=', 'manual')], context=context)
             for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
                 if not sale.invoiced:
                     res[account.id] += sale.amount_untaxed
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 38836b7fcbd..a8626eff92e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -68,7 +68,7 @@
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
-                                    context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
+                                    context="{'default_partner_id': [partner_id], 'search_default_project_id': [active_id],'default_project_id': [active_id]}"
                                     />
                             </td>
                         </tr><tr>

From 81f0cd8783ee4d76620af0921aaeefdbcdf78da0 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 4 Mar 2013 16:47:33 +0530
Subject: [PATCH 04/16] [IMP] improve string in invoicing section

bzr revid: fka@tinyerp.com-20130304111733-wnpc98u7mn3im8j3
---
 .../account_analytic_analysis_view.xml                          | 2 +-
 .../analytic_contract_hr_expense_view.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a8626eff92e..15b2337ded9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -65,7 +65,7 @@
                                 <span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
                                     No order to invoice, create
                                 </span>
-                                <button name="%(action_sales_order)d" string="Sale Orders"
+                                <button name="%(action_sales_order)d" string="Sales Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_project_id': [active_id],'default_project_id': [active_id]}"
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 5628846a6a0..2eae4aa1628 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -36,7 +36,7 @@
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="expenses" type="object"/>
+                                string="Expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>

From 548936166a8429cf89e1b0e1adacc3320f04804f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 4 Mar 2013 18:53:45 +0530
Subject: [PATCH 05/16] [IMP] make required field customer

bzr revid: fka@tinyerp.com-20130304132345-go4efgxiex0slpkl
---
 .../account_analytic_analysis_view.xml                         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 15b2337ded9..b8221aac359 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -26,6 +26,9 @@
                         </div>
                     </div>
                 </xpath>
+                <field name="partner_id" position="attributes">
+                    <attribute name="attrs">{'required': [('invoice_on_timesheets', '=', True)]}</attribute>
+                </field>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>

From ddb5904d6f46d8ad00fbf02de0ee9e66f00d155c Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 5 Mar 2013 12:22:32 +0530
Subject: [PATCH 06/16] [IMP] set default value of timesheet invoice ratio

bzr revid: fka@tinyerp.com-20130305065232-s5tjce9dj394yku4
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 1cb5c57e67e..6181ec45e12 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,6 +63,13 @@ class account_analytic_account(osv.osv):
 
         return res
 
+    def _get_default_to_invoice(self, cr, uid, context=None):
+        try:
+            invoice_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
+        except ValueError:
+            invoice_id = False
+        return invoice_id
+
     _inherit = "account.analytic.account"
     _columns = {
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
@@ -76,6 +83,7 @@ class account_analytic_account(osv.osv):
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
+        'to_invoice': _get_default_to_invoice,
     }
 
     def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None):

From c5d928f30cf9251fe4fd8721c978a33384870c8a Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 5 Mar 2013 12:47:04 +0530
Subject: [PATCH 07/16] [IMP] checked timesheet onchange of on timesheets

bzr revid: fka@tinyerp.com-20130305071704-7e43z4rps33ntouc
---
 addons/account_analytic_analysis/account_analytic_analysis.py  | 3 +++
 .../account_analytic_analysis_view.xml                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 723752db384..0aa4ad4533f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -531,6 +531,9 @@ class account_analytic_account(osv.osv):
 
         return True
 
+    def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
+        return {'value': {'use_timesheets': invoice_on_timesheets}}
+
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
     _description = "Hours Summary by User"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b8221aac359..9f029f84ec3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -78,7 +78,7 @@
                             <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
                             </td><td class="oe_timesheet_grey">
-                                <field name="invoice_on_timesheets"/>
+                                <field name="invoice_on_timesheets" on_change="onchange_invoice_on_timesheets(invoice_on_timesheets)"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>

From 9106bc423fa2b1b5f206170b91a9b4e6314dd9d6 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 5 Mar 2013 14:55:05 +0530
Subject: [PATCH 08/16] [IMP] add group_uom group on Unit of Measure column in
 Invoice Price Rate per User section

bzr revid: fka@tinyerp.com-20130305092505-8xo05otn5lforf0b
---
 addons/analytic_user_function/analytic_user_function_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 490b3026d7f..69e1add13bb 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -11,7 +11,7 @@
                     <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
                     <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
                     <field name="price"/>
-                    <field name="uom_id"/>
+                    <field name="uom_id" groups="product.group_uom"/>
                 </tree>
             </field>
         </record>
@@ -25,7 +25,7 @@
                         <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
                         <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
                         <field name="price"/>
-                        <field name="uom_id"/>
+                        <field name="uom_id" groups="product.group_uom"/>
                     </group>
                 </form>
             </field>

From 60d505dfaf43ab7e65c2b36cbf8a7441e38ca327 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 6 Mar 2013 16:48:48 +0530
Subject: [PATCH 09/16] [IMP] remove sales filter in time and materials to
 invoice menu

bzr revid: fka@tinyerp.com-20130306111848-id0zp6dwnmvox11e
---
 addons/account/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 62c8fb37075..e76e3bba476 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -188,7 +188,6 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
                     <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
                     <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
                     <separator/>

From bdbb287f71401b7c174388a170b6b37f16b4c41b Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 6 Mar 2013 18:48:36 +0530
Subject: [PATCH 10/16] [IMP] received email when renew contract

bzr revid: fka@tinyerp.com-20130306131836-d98z0o25sp21777e
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 0aa4ad4533f..31dbb7b730a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -527,7 +527,7 @@ class account_analytic_account(osv.osv):
         for user_id, data in remind.items():
             context["data"] = data
             _logger.debug("Sending reminder to uid %s", user_id)
-            self.pool.get('email.template').send_mail(cr, uid, template_id, user_id, context=context)
+            self.pool.get('email.template').send_mail(cr, uid, template_id, user_id, True, context=context)
 
         return True
 

From 39d3d6aa7759d1e0f89ef2ed3d81c6e9ebfe225a Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 7 Mar 2013 12:05:31 +0530
Subject: [PATCH 11/16] [IMP] set pricelist as a default

bzr revid: fka@tinyerp.com-20130307063531-6pnq7lictibbnybe
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 6181ec45e12..ace3b0b489a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -70,6 +70,13 @@ class account_analytic_account(osv.osv):
             invoice_id = False
         return invoice_id
 
+    def _get_default_pricelist_id(self, cr, uid, context=None):
+        try:
+            pricelist_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'list0')[1]
+        except ValueError:
+            pricelist_id = False
+        return pricelist_id
+
     _inherit = "account.analytic.account"
     _columns = {
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
@@ -82,7 +89,7 @@ class account_analytic_account(osv.osv):
             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, ctx: ctx.get('pricelist_id', False),
+        'pricelist_id': _get_default_pricelist_id,
         'to_invoice': _get_default_to_invoice,
     }
 

From 70e548affa45709c0ff1e1e38de73c904865351f Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 7 Mar 2013 14:24:08 +0530
Subject: [PATCH 12/16] [IMP] set default pricelist of customer

bzr revid: fka@tinyerp.com-20130307085408-b8mvqe14k9xhp95z
---
 addons/project/project.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/project/project.py b/addons/project/project.py
index 831bea64ce8..14809578068 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1297,6 +1297,11 @@ class account_analytic_account(osv.osv):
             context = {}
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
+        if vals['partner_id']:
+            partner = self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], context=context)
+            pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
+            if pricelist:
+                vals['pricelist_id'] = pricelist
         analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
         self.project_create(cr, uid, analytic_account_id, vals, context=context)
         return analytic_account_id

From d29957f302f8aa1ec24d9fa92ac990e8f50aec74 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 7 Mar 2013 15:16:13 +0530
Subject: [PATCH 13/16] [IMP]improve template type contract view

bzr revid: sgo@tinyerp.com-20130307094613-k36e87pz6v7m7ly2
---
 .../account_analytic_analysis_view.xml                        | 4 ++--
 .../analytic_contract_hr_expense_view.xml                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 50cdaff44d1..5522e0091be 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -53,7 +53,7 @@
                                 <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                            </td><td attrs="{'invisible': ['|',('fix_price_invoices','=',False),('type','=','template')]}" class="oe_timesheet_action">
                                 <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
                                     <button name="open_sale_order_lines"
                                         class="oe_link"
@@ -84,7 +84,7 @@
                                 <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
                                     <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
                                         type="action"
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 5628846a6a0..6e01076fbbd 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -21,7 +21,7 @@
                             <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
+                        </td><td attrs="{'invisible': ['|',('charge_expenses','=',False),('type','=','template')]}" class="oe_timesheet_action">
                             <span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
                                 <button
                                     name="hr_to_invoice_expense"

From 55535d2d454c5e6fe2fe6194ef2e1ccd8844ca06 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 7 Mar 2013 16:34:43 +0530
Subject: [PATCH 14/16] [IMP] set dropdown in sales settings

bzr revid: fka@tinyerp.com-20130307110443-3vfkmn42g4kijwem
---
 .../security/account_analytic_analysis_security.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
index 948c390e039..db9581e2444 100644
--- a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -8,7 +8,7 @@
 
     <record id="group_template_required" model="res.groups">
         <field name="name">Mandatory use of templates in contracts</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="category_id" ref="base.module_category_hidden"/>
         <field name="comment">the field template of the analytic accounts and contracts will be required.</field>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>

From b13e4056f956b407e679cefee241ed9aa422dd8c Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 7 Mar 2013 16:54:41 +0530
Subject: [PATCH 15/16] [IMP] improve code

bzr revid: fka@tinyerp.com-20130307112441-3dttp7kvjmj44pyo
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 14809578068..4a68ae08c5d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1297,7 +1297,7 @@ class account_analytic_account(osv.osv):
             context = {}
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
-        if vals['partner_id']:
+        if vals.get('partner_id', False):
             partner = self.pool.get('res.partner').browse(cr, uid, vals['partner_id'], context=context)
             pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
             if pricelist:

From 85158d8bbc1693e964538e181648951034dc0348 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Fri, 8 Mar 2013 14:05:20 +0530
Subject: [PATCH 16/16] [IMP]improve code for analytic user

bzr revid: sgo@tinyerp.com-20130308083520-tqfqztyv4zywkjqd
---
 addons/analytic_user_function/analytic_user_function.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index ec2aa1688d6..0573292c1f6 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -42,12 +42,12 @@ class analytic_user_funct_grid(osv.osv):
             return {}
 
         value = {}
+        if product_id:
+           prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
         if emp.product_id and not product_id:
             value['product_id'] = emp.product_id.id
             prod = emp.product_id
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
         if prod:
             value['price'] = prod.list_price
             value['uom_id'] = prod.uom_id.id