From 7a61db0b969284bc616643653606613d974c5f41 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 17:29:15 +0530
Subject: [PATCH 1/6] [FIX] account_analytic_account : No such external ID
 currently defined in the system: project.group_project_user.

bzr revid: mdi@tinyerp.com-20120723115915-5qrdbx01grydc8wq
---
 addons/account_analytic_analysis/security/ir.model.access.csv | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 4af43dbcb2f..74425cea3dd 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -3,5 +3,3 @@ access_account_analytic_analysis_summary_user_sale,account_analytic_analysis.sum
 access_account_analytic_analysis_summary_month_sale,account_analytic_analysis.summary.month sale,model_account_analytic_analysis_summary_month,base.group_sale_salesman,1,0,0,0
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
-access_account_analytic_analysis_summary_user_project_user,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_user,1,0,0,0
-access_account_analytic_analysis_summary_month_project_user,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_user,1,0,0,0

From 69d9a3d4e26a82c1ea221b4840c827744de39f06 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 17:35:31 +0530
Subject: [PATCH 2/6] [IMP] analytic, account_analytic_account : The field
 'template_id' need to moved from 'account_analytic_analysis' module to
 'analytic' so we can override 'on_change_template' from respective
 module(project, project_issue and hr_timesheet).

bzr revid: mdi@tinyerp.com-20120723120531-38reqpofvzh69bo7
---
 .../account_analytic_analysis.py              | 22 ++++++++-----------
 .../account_analytic_analysis_view.xml        |  3 ---
 addons/analytic/analytic.py                   | 12 ++++++++++
 addons/analytic/analytic_view.xml             |  1 +
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 6e15fe1d5a5..524d5de153a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -455,7 +455,6 @@ class account_analytic_account(osv.osv):
         'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
-        'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
         'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
         'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"),
         'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"),
@@ -483,18 +482,15 @@ class account_analytic_account(osv.osv):
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         if not template_id:
             return {}
-        res = {'value':{}}
-        template = self.browse(cr, uid, template_id, context=context)
-        res['value']['date_start'] = template.date_start
-        res['value']['date'] = template.date
-        res['value']['fix_price_invoices'] = template.fix_price_invoices
-        res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
-        res['value']['quantity_max'] = template.quantity_max
-        res['value']['hours_qtt_est'] = template.hours_qtt_est
-        res['value']['amount_max'] = template.amount_max
-        res['value']['to_invoice'] = template.to_invoice.id
-        res['value']['pricelist_id'] = template.pricelist_id.id
-        res['value']['description'] = template.description
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['fix_price_invoices'] = template.fix_price_invoices
+            res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
+            res['value']['hours_qtt_est'] = template.hours_qtt_est
+            res['value']['amount_max'] = template.amount_max
+            res['value']['to_invoice'] = template.to_invoice.id
+            res['value']['pricelist_id'] = template.pricelist_id.id
         return res
 account_analytic_account()
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index ead87c176e3..32839063f02 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -20,9 +20,6 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="40" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="type"]' position='after'>
-                    <field name="template_id" on_change="on_change_template(template_id,context)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
-                </xpath>
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index af8b1615864..c16ed82a580 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -161,6 +161,7 @@ class account_analytic_account(osv.osv):
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
                                   "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
                                   "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
+        'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
@@ -184,6 +185,17 @@ class account_analytic_account(osv.osv):
             }, string='Currency', type='many2one', relation='res.currency'),
     }
     
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        if not template_id:
+            return {}
+        res = {'value':{}}
+        template = self.browse(cr, uid, template_id, context=context)
+        res['value']['date_start'] = template.date_start
+        res['value']['date'] = template.date
+        res['value']['quantity_max'] = template.quantity_max
+        res['value']['description'] = template.description
+        return res
+    
     def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 6d6a38b4b44..d590506a0c6 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -18,6 +18,7 @@
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
                                 <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                                 <field name="type"/>
+                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                             </group>
                             <group>
                                 <field name="code"/>

From 8ee2cca8220340870068eed88bfb6976565c635d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 17:37:54 +0530
Subject: [PATCH 3/6] [IMP] project : Override the 'on_change_template' method.

bzr revid: mdi@tinyerp.com-20120723120754-a1tjp5tpbooxskhk
---
 addons/project/project.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/project/project.py b/addons/project/project.py
index aa9316aec1b..f446d8b6900 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1225,6 +1225,13 @@ class account_analytic_account(osv.osv):
         'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_tasks'] = template.use_tasks
+        return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         '''

From c1c88c74940ce180635e0c65b660765cadf378cc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 17:39:07 +0530
Subject: [PATCH 4/6] [IMP] project_issue : Override the 'on_change_template'
 method.

bzr revid: mdi@tinyerp.com-20120723120907-qgg7b7jzc2zq17t6
---
 addons/project_issue/project_issue.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ca5bd9224f2..a7c9d2b5bc3 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -593,6 +593,13 @@ class account_analytic_account(osv.osv):
         'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
     }
     
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_issues'] = template.use_issues
+        return res
+    
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or vals.get('use_issues')

From cbcf68d3d98d25e8128b9869f225396667eb8b50 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 17:40:29 +0530
Subject: [PATCH 5/6] [IMP] hr_timesheet : Override the 'on_change_template'
 method.

bzr revid: mdi@tinyerp.com-20120723121029-9manyfm4brhsbuf0
---
 addons/hr_timesheet/hr_timesheet.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 66911f25ff5..53119853c31 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -198,6 +198,13 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
     }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_timesheets'] = template.use_timesheets
+        return res
 
 account_analytic_account()
 

From 6dcf691e70315d70a4a79845da51091866b6c77b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 24 Jul 2012 11:53:03 +0530
Subject: [PATCH 6/6] [IMP] project_long_term : Override the
 'on_change_template' method.

bzr revid: mdi@tinyerp.com-20120724062303-xoc4l9ye72x5lz3f
---
 addons/project_long_term/project_long_term.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..25aa98016e9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -275,6 +275,13 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
     }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_phases'] = template.use_phases
+        return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
         res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)