diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c759ac4ea14..4489cfea1a2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -202,13 +202,13 @@
                         <field name="number" select="1"/>
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                        <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
+                        <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                             <field name="name" select="2"/>
-                            <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
+                            <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
@@ -555,7 +555,7 @@
 
         <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4"/>
 
-        <act_window domain="[('partner_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_res_partner_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
diff --git a/addons/account/data/account_minimal.xml b/addons/account/data/account_minimal.xml
index 12ffb7e3c1f..325326f8754 100644
--- a/addons/account/data/account_minimal.xml
+++ b/addons/account/data/account_minimal.xml
@@ -97,6 +97,12 @@ your own chart of account.
             <field eval="'account.account,'+str(a_pay)" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
+        <record forcecreate="True" id="property_account_supplier_tax" model="ir.property">
+            <field name="name">property_account_supplier_tax</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_supplier_tax')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
         <record forcecreate="True" id="property_account_tax" model="ir.property">
             <field name="name">property_account_tax</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_tax')]"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 89e47a1ac43..fe4d16196c8 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -794,6 +794,8 @@ class account_invoice_line(osv.osv):
         return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, context={}):
+        if not partner_id:
+            raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
                 return {'domain':{'product_uom':[]}}
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index bf0dcce3c9a..a2f95a1a04a 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -38,7 +38,7 @@ class account_analytic_default(osv.osv):
     _order = 'sequence'
     _columns = {
         'sequence': fields.integer('Sequence'),
-        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'),
         'user_id': fields.many2one('res.users', 'User', ondelete='cascade'),
@@ -49,14 +49,18 @@ class account_analytic_default(osv.osv):
     def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context={}):
         domain = []
         if product_id:
-            domain += ['|',('product_id','=',product_id),('product_id','=',False)]
+            domain += ['|',('product_id','=',product_id)]
+        domain += [('product_id','=',False)]
         if partner_id:
-            domain += ['|',('partner_id','=',partner_id),('partner_id','=',False)]
-        if partner_id:
-            domain += ['|',('user_id','=',uid),('user_id','=',False)]
+            domain += ['|',('partner_id','=',partner_id)]
+        domain += [('partner_id','=',False)]
+        if user_id:
+            domain += ['|',('user_id','=',uid)]
+        domain += [('user_id','=',False)]
         if date:
             domain += ['|',('date_start','<=',date),('date_start','=',False)]
             domain += ['|',('date_stop','>=',date),('date_stop','=',False)]
+        print 'DOMAIN', domain
         best_index = -1
         res = False
         for rec in self.browse(cr, uid, self.search(cr, uid, domain, context=context), context=context):
@@ -79,7 +83,7 @@ class account_invoice_line(osv.osv):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
         if rec:
-            res_prod['value'].update({'account_analytic_id':res.account_id.id})
+            res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
         return res_prod
 account_invoice_line()
 
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index a2d4e0df0b8..fb5eb636f01 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults" editable="bottom">
                     <field name="sequence" string="Seq"/>
-                    <field name="analytic_id" select="1"/>
+                    <field name="analytic_id" select="1" required="True"/>
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
@@ -24,7 +24,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" select="1"/>
+                    <field name="analytic_id" select="1" required="True"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
                     <field name="product_id" select="2"/>
@@ -47,33 +47,26 @@
             id="menu_analytic_defaul_form" 
             parent="account.menu_analytic_accounting"/>
 
-        <record id="analytic_rules_partner_action" model="ir.actions.act_window">
-            <field name="name">Analytic Rules</field>
-            <field name="res_model">account.analytic.default</field>
-            <field name="src_model">res.partner</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('partner_id','=',active_id)]</field>
-        </record>
-        <record id="analytic_rules_user_action" model="ir.actions.act_window">
-            <field name="name">Analytic Rules</field>
-            <field name="res_model">account.analytic.default</field>
-            <field name="src_model">res.users</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',active_id)]</field>
-        </record>
-        <record id="analytic_rules_product_action" model="ir.actions.act_window">
-            <field name="name">Analytic Rules</field>
-            <field name="res_model">account.analytic.default</field>
-            <field name="src_model">product.product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('product_id','=',active_id)]</field>
-        </record>
+        <act_window
+            domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
+        <act_window
+            name="Analytic Rules"
+            id="analytic_rule_action_partner"
+            res_model="account.analytic.default"
+            src_model="res.partner"
+            domain="[('partner_id','=',active_id)]"/>
+        <act_window
+            name="Analytic Rules"
+            id="analytic_rule_action_user"
+            res_model="account.analytic.default"
+            src_model="res.users"
+            domain="[('user_id','=',active_id)]"/>
+        <act_window
+            name="Analytic Rules"
+            res_model="account.analytic.default"
+            id="analytic_rule_action_product"
+            src_model="product.product"
+            domain="[('product_id','=',active_id)]"/>
 
     </data>
 </terp>
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index b9c14619382..cc568c70a2a 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -261,12 +261,10 @@ class account_invoice_line(osv.osv):
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, price_unit=False, address_invoice_id=False, context={}):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, price_unit, address_invoice_id, context)
-        if product:
-            res = self.pool.get('product.product').browse(cr, uid, product, context=context)
-            res_prod['value'].update({'analytics_id':res.property_account_distribution.id})
+        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
+        if rec and rec.analytics_id:
+            res_prod['value'].update({'analytics_id':rec.analytics_id.id})
         return res_prod
-
-
 account_invoice_line()
 
 class account_move_line(osv.osv):
@@ -374,24 +372,10 @@ class account_analytic_plan(osv.osv):
     }
 account_analytic_plan()
 
-class product_product(osv.osv):
-    _name = 'product.product'
-    _inherit = 'product.product'
-    _description = 'Product'
-
+class analytic_default(osv.osv):
+    _inherit = 'account.analytic.default'
     _columns = {
-        'property_account_distribution': fields.property(
-            'account.analytic.plan.instance',
-            type='many2one',
-            relation='account.analytic.plan.instance',
-            string="Analytic Distribution",
-            method=True,
-            view_load=True,
-            group_name="Accounting Properties",
-            help="This Analytic Distribution will be use in sale order line and invoice lines",
-            ),
-                }
-
-product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
+    }
+analytic_default()
 
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index cd992cdf049..c33122ca00f 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -4,245 +4,245 @@
 
 <!-- Add plan_id after user_id in account.journal many2one with account.analytic.plan -->
 
-	<record model="ir.ui.view" id="view_account_journal_form_inherit">
-		<field name="name">account.journal.form.inherit</field>
-		<field name="model">account.journal</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="account.view_account_journal_form"/>
-		<field name="arch" type="xml">
-			<field name="centralisation" position="before">
-				<field name="plan_id" />
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_account_journal_form_inherit">
+        <field name="name">account.journal.form.inherit</field>
+        <field name="model">account.journal</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account.view_account_journal_form"/>
+        <field name="arch" type="xml">
+            <field name="centralisation" position="before">
+                <field name="plan_id" />
+            </field>
+        </field>
+    </record>
 
 
-	<record model="ir.ui.view" id="view_move_line_form_inherit">
-		<field name="name">account.move.line.form.inherit</field>
-		<field name="model">account.move.line</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="account.view_move_line_form"/>
-		<field name="arch" type="xml">
-			<field name="move_id" position="after">
-				<field name="analytics_id" />
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_move_line_form_inherit">
+        <field name="name">account.move.line.form.inherit</field>
+        <field name="model">account.move.line</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="arch" type="xml">
+            <field name="move_id" position="after">
+                <field name="analytics_id" />
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_move_line_tree_inherit">
-		<field name="name">account.move.line.tree.inherit</field>
-		<field name="model">account.move.line</field>
-		<field name="type">tree</field>
-		<field name="inherit_id" ref="account.view_move_line_tree"/>
-		<field name="arch" type="xml">
-			<field name="move_id" position="after">
-				<field name="analytics_id" />
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_move_line_tree_inherit">
+        <field name="name">account.move.line.tree.inherit</field>
+        <field name="model">account.move.line</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="arch" type="xml">
+            <field name="move_id" position="after">
+                <field name="analytics_id" />
+            </field>
+        </field>
+    </record>
 
 <!-- Replace analytic_id with analytics_id in account.invoice.line -->
 
-	<record model="ir.ui.view" id="view_invoice_line_form_inherit">
-		<field name="name">account.invoice.line.form.inherit</field>
-		<field name="model">account.invoice.line</field>
-		<field name="inherit_id" ref="account.view_invoice_line_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<field name="account_analytic_id" position="replace">
-				<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_invoice_line_form_inherit">
+        <field name="name">account.invoice.line.form.inherit</field>
+        <field name="model">account.invoice.line</field>
+        <field name="inherit_id" ref="account.view_invoice_line_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="invoice_supplier_form_inherit">
-		<field name="name">account.invoice.supplier.form.inherit</field>
-		<field name="model">account.invoice</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="account.invoice_supplier_form"/>
-		<field name="priority">2</field>
-		<field name="arch" type="xml">
-			<field name="account_analytic_id" position="replace">
-				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" />
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="invoice_supplier_form_inherit">
+        <field name="name">account.invoice.supplier.form.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+        <field name="priority">2</field>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" />
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="account_analytic_plan_instance_form">
-		<field name="name">account.analytic.plan.instance.form</field>
-		<field name="model">account.analytic.plan.instance</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Analytic Distribution">
-				<field name="name" select="1"/>
-				<field name="code" select="1"/>
-				<field name="plan_id" select="2" required="True"/>
-				<field name="journal_id" select="2"/>
-				<field name="account_ids" string="Analytic Distribution" colspan="4">
-					<tree string="Analytic Distribution" editable="bottom">
-						<field name="rate"/>
-						<field name="analytic_account_id"/>
-					</tree>
-				</field>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_instance_form">
+        <field name="name">account.analytic.plan.instance.form</field>
+        <field name="model">account.analytic.plan.instance</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Analytic Distribution">
+                <field name="name" select="1"/>
+                <field name="code" select="1"/>
+                <field name="plan_id" select="2" required="True"/>
+                <field name="journal_id" select="2"/>
+                <field name="account_ids" string="Analytic Distribution" colspan="4">
+                    <tree string="Analytic Distribution" editable="bottom">
+                        <field name="rate"/>
+                        <field name="analytic_account_id"/>
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
 
 
-	<record model="ir.ui.view" id="account_analytic_plan_instance_tree">
-		<field name="name">account.analytic.plan.instance.tree</field>
-		<field name="model">account.analytic.plan.instance</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Analytic Distribution">
-				<field name="name"/>
-				<field name="code"/>
-				<field name="plan_id"/>
-				<field name="journal_id"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_instance_tree">
+        <field name="name">account.analytic.plan.instance.tree</field>
+        <field name="model">account.analytic.plan.instance</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Distribution">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="plan_id"/>
+                <field name="journal_id"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="account_analytic_plan_instance_action">
-		<field name="name">Analytic Distribution's Models</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.analytic.plan.instance</field>
-		<field name="domain">[('plan_id','&lt;&gt;',False)]</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
+    <record model="ir.actions.act_window" id="account_analytic_plan_instance_action">
+        <field name="name">Analytic Distribution's Models</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.analytic.plan.instance</field>
+        <field name="domain">[('plan_id','&lt;&gt;',False)]</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-	<act_window name="Distribution Models"
-		domain="[('plan_id', '=', active_id),('plan_id','&lt;&gt;',False)]"
-		context="{'plan_id': active_id}"
-		res_model="account.analytic.instance"
-		src_model="account.analytic.plan"
-		id="account_analytic_instance_model_open"/>
+    <act_window name="Distribution Models"
+        domain="[('plan_id', '=', active_id),('plan_id','&lt;&gt;',False)]"
+        context="{'plan_id': active_id}"
+        res_model="account.analytic.instance"
+        src_model="account.analytic.plan"
+        id="account_analytic_instance_model_open"/>
 
-	<menuitem
-		name="Analytic Distribution's models" parent="account.next_id_32"
-		id="menu_account_analytic_plan_instance_action"
-		action="account_analytic_plan_instance_action"/>
+    <menuitem
+        name="Analytic Distribution's models" parent="account.next_id_32"
+        id="menu_account_analytic_plan_instance_action"
+        action="account_analytic_plan_instance_action"/>
 
-	<record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
-		<field name="name">account.analytic.plan.instance.line.form</field>
-		<field name="model">account.analytic.plan.instance.line</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Analytic Distribution Line">
-				<field name="plan_id"/>
-				<field name="analytic_account_id"/>
-				<field name="rate"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
+        <field name="name">account.analytic.plan.instance.line.form</field>
+        <field name="model">account.analytic.plan.instance.line</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Analytic Distribution Line">
+                <field name="plan_id"/>
+                <field name="analytic_account_id"/>
+                <field name="rate"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="account_analytic_plan_instance_line_tree">
-		<field name="name">account.analytic.plan.instance.line.tree</field>
-		<field name="model">account.analytic.plan.instance.line</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Analytic Distribution Lines">
-				<field name="plan_id" select="1"/>
-				<field name="analytic_account_id" select="1"/>
-				<field name="rate"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_instance_line_tree">
+        <field name="name">account.analytic.plan.instance.line.tree</field>
+        <field name="model">account.analytic.plan.instance.line</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Distribution Lines">
+                <field name="plan_id" select="1"/>
+                <field name="analytic_account_id" select="1"/>
+                <field name="rate"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="account_analytic_plan_form">
-		<field name="name">account.analytic.plan.form</field>
-		<field name="model">account.analytic.plan</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Analytic Plan">
-				<field name="name" select="1"/>
-				<field name="default_instance_id"/>
-				<field name="plan_ids" colspan="4"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_form">
+        <field name="name">account.analytic.plan.form</field>
+        <field name="model">account.analytic.plan</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Analytic Plan">
+                <field name="name" select="1"/>
+                <field name="default_instance_id"/>
+                <field name="plan_ids" colspan="4"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="account_analytic_plan_tree">
-		<field name="name">account.analytic.plan.tree</field>
-		<field name="model">account.analytic.plan</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Analytic Plans">
-				<field name="name"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_tree">
+        <field name="name">account.analytic.plan.tree</field>
+        <field name="model">account.analytic.plan</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Plans">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
 
-	<record model="ir.actions.act_window" id="account_analytic_plan_form_action">
-		<field name="name">Analytic Plan</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.analytic.plan</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
+    <record model="ir.actions.act_window" id="account_analytic_plan_form_action">
+        <field name="name">Analytic Plan</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.analytic.plan</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-	<menuitem
-		parent="account.account_analytic_def_account"
-		id="menu_account_analytic_plan_action"
-		action="account_analytic_plan_form_action"/>
+    <menuitem
+        parent="account.account_analytic_def_account"
+        id="menu_account_analytic_plan_action"
+        action="account_analytic_plan_form_action"/>
 
-	<record model="ir.ui.view" id="account_analytic_plan_line_form">
-		<field name="name">account.analytic.plan.line.form</field>
-		<field name="model">account.analytic.plan.line</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Analytic Plan Line">
-				<field name="name"/>
-				<field name="sequence"/>
-				<field name="root_analytic_id"/>
-				<newline/>
-				<field name="min_required"/>
-				<field name="max_required"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_line_form">
+        <field name="name">account.analytic.plan.line.form</field>
+        <field name="model">account.analytic.plan.line</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Analytic Plan Line">
+                <field name="name"/>
+                <field name="sequence"/>
+                <field name="root_analytic_id"/>
+                <newline/>
+                <field name="min_required"/>
+                <field name="max_required"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="account_analytic_plan_line_tree">
-		<field name="name">account.analytic.plan.line.tree</field>
-		<field name="model">account.analytic.plan.line</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Analytic Plan Lines">
-				<field name="name" select="1"/>
-				<field name="sequence"/>
-				<field name="root_analytic_id" select="2"/>
-				<field name="min_required"/>
-				<field name="max_required"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="account_analytic_plan_line_tree">
+        <field name="name">account.analytic.plan.line.tree</field>
+        <field name="model">account.analytic.plan.line</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Analytic Plan Lines">
+                <field name="name" select="1"/>
+                <field name="sequence"/>
+                <field name="root_analytic_id" select="2"/>
+                <field name="min_required"/>
+                <field name="max_required"/>
+            </tree>
+        </field>
+    </record>
 
-	<!-- add property field on product -->
+    <!-- add property field on product -->
 
-	<record model="ir.ui.view" id="view_template_property_distribution_form">
-			<field name="name">product.template.property.distribution.form.inherit</field>
-			<field name="type">form</field>
-			<field name="model">product.template</field>
-			<field name="inherit_id" ref="product.product_template_form_view"/>
-			<field name="arch" type="xml">
-				<field name="property_account_analytic" position="replace">
-					<field name="property_account_distribution"/>
-				</field>
-			</field>
-		</record>
-	<record model="ir.ui.view" id="view_normal_property_distribution_form">
-			<field name="name">product.normal.property.distribution.form.inherit</field>
-			<field name="type">form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view"/>
-			<field name="arch" type="xml">
-				<field name="property_account_analytic" position="replace">
-					<field name="property_account_distribution"/>
-				</field>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_default_inherit_form">
+            <field name="name">account.analytic.default.form.plans</field>
+            <field name="type">form</field>
+            <field name="model">account.analytic.default</field>
+            <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
+            <field name="arch" type="xml">
+                <field name="analytic_id" position="replace">
+                    <field name="analytics_id" select="1" required="True"/>
+                </field>
+            </field>
+        </record>
+         <record model="ir.ui.view" id="view_default_inherit_tree">
+            <field name="name">account.analytic.default.tree.plans</field>
+            <field name="type">tree</field>
+            <field name="model">account.analytic.default</field>
+            <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
+            <field name="arch" type="xml">
+                <field name="analytic_id" position="replace">
+                    <field name="analytics_id" select="1" required="True"/>
+                </field>
+            </field>
+        </record>
 
 </data>
 </terp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 0d69f6c5cd0..ab53db828e1 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -295,8 +295,6 @@ class product_template(osv.osv):
         'procure_method': lambda *a: 'make_to_stock',
         'uom_id': _get_uom_id,
         'uom_po_id': _get_uom_id,
-        #'uom_price_id' : _get_uom_id,
-        #'uos_id' : _get_uom_id,
         'uos_coeff' : lambda *a: 1.0,
         'mes_type' : lambda *a: 'fixed',
     }