diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1a7af764a9f..a1cc078642b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -75,39 +75,6 @@
             </field>
         </record>
 
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form layout="manual">
-                <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"/>
-                            <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"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
-                        </group>
-                        <notebook colspan="4">
-                            <page string="Contract Information" name="contract_page">
-                                <group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Validity"/>
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                </group>
-                                <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
-                                    <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
-                                </group>
-                            </page>
-                        </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>
-
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c61efb23819..6e7a7e60b7d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -33,7 +33,7 @@
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
             	<xpath expr='//field[@name="parent_id"]' position='after'>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 13c97ca32d6..f86bdf14393 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -267,7 +267,7 @@
             <field name="name">account.analytic.account.form.inherot.budget</field>
             <field name="type">form</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Budget Lines">
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 1456e4dbfaa..36f8e8cc81a 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -38,6 +38,7 @@ that have no counterpart in the general financial accounts.
     "update_xml": ['security/analytic_security.xml',
                    "security/ir.model.access.csv",
                    "analytic_sequence.xml",
+                   "analytic_view.xml"
     ],
     'demo_xml': [
     ],
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index fd5212f8513..f468ef36f91 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -166,7 +166,7 @@ class account_analytic_account(osv.osv):
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
@@ -183,6 +183,15 @@ class account_analytic_account(osv.osv):
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
     }
+    
+    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
+        res={}
+        if partner_id:
+            part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
+            res['name'] = part.name
+            if part.user_id:
+                res['user_id'] = part.user_id.id
+        return {'value': res}
 
     def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
new file mode 100644
index 00000000000..cc9f351074d
--- /dev/null
+++ b/addons/analytic/analytic_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">analytic.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form  layout="manual">
+                    <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="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"/>
+                            <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Contract Information" name="contract_page">
+                                <group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
+                                    <separator colspan="2" string="Validity"/>
+                                    <field name="date_start"/>
+                                    <field name="date"/>
+                                </group>
+                                <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
+                                    <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+     </data>
+</openerp>
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 0582655374f..ccc6be3252f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -32,7 +32,7 @@
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page" position="after">
                     <page string="Users/Products Rel.">
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 1134495d4fd..8d678f19554 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -78,16 +78,12 @@ class account_analytic_account(osv.osv):
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
     def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
-        res={}
-        if partner_id:
-            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
-            res['name'] = part.name
-            if part.user_id:
-                res['user_id'] = part.user_id.id
-            if pricelist:
-                res['pricelist_id'] = pricelist
-        return {'value': res}
+        res=super(account_analytic_account,self).on_change_partner_id(cr, uid, id, partner_id, context=context)
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
+        if pricelist:
+            res['value']['pricelist_id'] = pricelist
+        return res
 
     def set_close(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'close'}, context=context)
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 87e54dfc22f..5691ae438e6 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -5,10 +5,10 @@
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="on_change_partner_id(partner_id, context)" required="True"/>
+                    <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
                 </field>
                 <group name="contract" position="after">
                     <group colspan="2" col="2" name="invoice_data">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 11e9b057c06..84632f326a4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -304,7 +304,7 @@
             <field name="name">planning.account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Planning" >