From 1918bb0a069617d0cd8470bdd5d98e6ba363ab7d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:15:29 +0530
Subject: [PATCH 1/6] [IMP]project: Set privacy_visibility instead of
 privacy_visility.

bzr revid: dbr@tinyerp.com-20120607054529-n7sigtg2a5y6zg1i
---
 addons/project/project.py       | 4 ++--
 addons/project/project_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 25997b1a91e..cd274f1cc5c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,7 +78,7 @@ class project(osv.osv):
                members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
            else:
                members = project_id.members or False
-           select = vals.get('privacy_visility') or project_id.privacy_visility or False
+           select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
            if select=='follower' and members:
                member_list = [member.id for member in members]
                followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
@@ -220,7 +220,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visility', select=True),
+        'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
      }
     
     def dummy(self, cr, uid, ids, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e6c160dac8f..7f8f34df2ce 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                            <field name="privacy_visility"/>
+                            <field name="privacy_visibility"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->

From 2c3e08224e85467a08584649105974ed0289a8a1 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:18:18 +0530
Subject: [PATCH 2/6] [IMP]account_analytic_analysis: Set Template of Contract
 instead of Template Of Contract

bzr revid: dbr@tinyerp.com-20120607054818-6v2ci3izb0wpi8y8
---
 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 aff71cfef7b..325867ca225 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -467,7 +467,7 @@ class account_analytic_account(osv.osv):
         'charge_expenses' : fields.boolean('Charge Expenses'),
         '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'),
+        'template_id':fields.many2one('account.analytic.account', 'Template of Contract'),
         'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"),
         'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'),
         'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"), 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index ffd1e614c90..851618bae5a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -224,7 +224,7 @@
         </record>
         
         <record id="template_of_contract_action" model="ir.actions.act_window">
-            <field name="name">Template Of Contract</field>
+            <field name="name">Template of Contract</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>

From fd83df8c62a5ac72374966c53487de6bc4e2bde0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:20:59 +0530
Subject: [PATCH 3/6] [IMP]account: set full name for Analytic account list
 view

bzr revid: dbr@tinyerp.com-20120607055059-ei1g4djqtt3xjgcn
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index a1cc078642b..42953c70407 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -59,7 +59,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="code"/>
                     <field name="debit"/>
                     <field name="credit"/>

From 861f6ce70eb7bfdd596c89a7afc47f1d5bea1269 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:24:36 +0530
Subject: [PATCH 4/6] [IMP]analytic: Improve on_change_partner_id.

bzr revid: dbr@tinyerp.com-20120607055436-ipyx4dku1suhxd21
---
 addons/analytic/analytic.py                         | 5 +++--
 addons/analytic/analytic_view.xml                   | 2 +-
 addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 772dcd57e12..dac62cf5e12 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -178,11 +178,12 @@ class account_analytic_account(osv.osv):
             }, string='Currency', type='many2one', relation='res.currency'),
     }
     
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
             part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
-            res['name'] = part.name
+            if not name:
+                res['name'] = part.name
             if part.user_id:res['user_id'] = part.user_id.id
         return {'value': res}
 
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index e83a2485e0b..c8576f564b6 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -11,7 +11,7 @@
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
                             <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 257fde74ce9..e83cd2c6d22 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,8 +77,8 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
-        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, context=context)
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+        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)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:res['value']['pricelist_id'] = pricelist

From b619fa8c01f6c4dcbe46caf3627181cae27a992e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:34:07 +0530
Subject: [PATCH 5/6] [IMP]analytic: Remove attrs from type field

bzr revid: dbr@tinyerp.com-20120607060407-97iu7kh4zq0gnno5
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index c8576f564b6..3763d2c880d 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -15,7 +15,7 @@
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                            <field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                            <field name="type" select="2"/>
                             <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                         </group>
                         <notebook colspan="4">

From 2ce7c4e329e1b1aea9bd117c7798898a18369c4b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 13:02:25 +0530
Subject: [PATCH 6/6] [FIX]project: members field remove from .py but not from
 .xml so now remove

bzr revid: dbr@tinyerp.com-20120607073225-hdvwrcd8avtdxx0g
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f8f34df2ce..d91c412b11c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -630,7 +630,7 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
                         <separator colspan="4" string="Team"/>
-                        <field name="members" colspan="4" nolabel="1"/>
+                        <!--<field name="members" colspan="4" nolabel="1"/>-->
                     </group>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>