diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 1fa0a5c6cfa..ba33185119e 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -167,7 +167,7 @@ class res_partner(osv.osv):
     
     _columns = {
                 'contract_ids': fields.one2many('account.analytic.account', \
-                                                    'partner_id', 'Contracts'), 
+                                                    'partner_id', 'Contracts', readonly=True), 
                 }
 
 res_partner()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2da7c71021c..1565b2d0aa8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -481,21 +481,5 @@
 		
 		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
-		<!--  Partners inherited form -->
-        
-        <record id="view_invoice_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.invoice.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Account Info">
-                        <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index dbaa321f329..e4c810fa6be 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1525,7 +1525,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'),
+                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
                 }
 
 res_partner()
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 113db6f2ea2..e434f28d947 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -118,10 +118,27 @@
                             <field name="acc_number"/>
                         </tree>
                     </field>
+                    <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
                 </page>
                 </notebook>
             </field>
         </record>
+        
+        <!--  Partners info tab view-->
 
+        <record id="view_account_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.account.info.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Project">
+                        <field name="contract_ids" colspan="4" nolabel="1" />
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e57629d2618..14e65a2a9ac 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -443,21 +443,6 @@
                 </graph>
             </field>
      </record>
-	
-	<!--  Partners inherited form -->
-
-		<record id="view_contract_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.contract.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-             	<field name="invoice_ids" position="after">
-					<field name="contract_ids" colspan="4" nolabel="1" />
-				</field>
-            </field>
-        </record>
-	
 
     </data>
 </openerp>
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 84fd933d9a9..1db16ca8787 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -47,7 +47,7 @@ class account_analytic_default(osv.osv):
             domain += ['|',('partner_id','=',partner_id)]
         domain += [('partner_id','=',False)]
         if user_id:
-            domain += ['|',('user_id','=',uid)]
+            domain += ['|',('user_id','=',user_id)]
         domain += [('user_id','=',False)]
         if date:
             domain += ['|',('date_start','<=',date),('date_start','=',False)]
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index de0fac56e29..362444ccc2c 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -33,6 +33,7 @@ import crm_installer
 import report
 import wizard
 
+import res_partner
 
 
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index afe500516d3..337ee802bee 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -96,7 +96,9 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml'
+        'crm_installer_view.xml', 
+        
+        'res_partner_view.xml'
     ],
     'demo_xml': [
         'crm_demo.xml',
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 20ae1176ca6..e45ee85b31d 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -175,16 +175,4 @@ class res_users(osv.osv):
 res_users()
 
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds meetings information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-                                                     'Meetings'), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ac61809cfad..28cf42e3a73 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -324,21 +324,5 @@
                 </field>
         </record>
 
-        <!--  Partners inherited form -->
-
-		<record id="view_meeting_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.meeting.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-               		<page string="CRM Info">
-						<field name="meeting_ids" colspan="4" nolabel="1" />
-					</page>
-                </notebook>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3bc9fdd6d81..98e4c6f3ded 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -163,16 +163,4 @@ class crm_opportunity(osv.osv):
 
 crm_opportunity()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Opportunities information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ecabf5f57f8..773f8584c12 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -330,59 +330,21 @@
                 </field>
             </record>
     
-    <!--  Partners inherited form -->
 
-            <record id="view_opp_partner_info_form" model="ir.ui.view">
-                <field name="name">res.partner.opportunity.info.inherit</field>
-                <field name="model">res.partner</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="base.view_partner_form"/>
+        <!-- Opportunities Graph View -->
+
+            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+                <field name="name">CRM - Opportunity Graph</field>
+                <field name="model">crm.lead</field>
+                <field name="type">graph</field>
                 <field name="arch" type="xml">
-                    <field name="phonecall_ids" position="after">
-                       <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-                           <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-                            <field name="create_date"/>
-                            <field name="partner_name"/>
-                            <field name="name"/>
-                            <field name="email_from"/>
-                            <field name="phone"/>
-            
-                            <field name="categ_id" invisible="1"/>
-                            <field name="type_id" invisible="1"/>
-                            <field name="referred" invisible="1"/>
-            
-                            <field name="stage_id"/>
-                            <button name="stage_previous" string="Previous"
-                                states="open,pending" type="object" icon="gtk-go-back" />
-                            <button name="stage_next" string="Next"
-                                states="open,pending" type="object"
-                                icon="gtk-go-forward" />
-                            <field name="section_id"
-                                invisible="context.get('invisible_section', True)" />
-                            <field name="user_id" />
-                            <field name="state" />
-                            <button name="case_open" string="Open"
-                                states="draft,pending" type="object"
-                                icon="gtk-go-forward" />
-                            <button name="case_close" string="Close"
-                                states="open,draft,pending" type="object"
-                                icon="gtk-close" />
-                            <button string="Convert to Opportunity"
-                                name="convert_opportunity"
-                                states="draft,open,pending" icon="gtk-index"
-                                type="object" />
-                            <button name="case_escalate" string="Escalate"
-                                states="open,draft,pending" type="object"
-                                icon="gtk-go-up" />
-                            <button name="case_cancel" string="Cancel"
-                                states="draft,open,pending" type="object"
-                                icon="gtk-cancel" />
-                        </tree>
-                    </field>
+                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                        <field name="categ_id"/>
+                        <field name="planned_revenue" operator="+"/>
+                        <field name="state" group="True"/>
+                    </graph>
                 </field>
-            </field>
-        </record>
-
+            </record>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 7131a3730d2..205b30d39dc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -178,15 +178,5 @@ class crm_phonecall(osv.osv, crm_case):
 
 crm_phonecall()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Phonecalls information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
-                }
-
-res_partner()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a72a8df9de8..65b77ed5abe 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -289,19 +289,5 @@
         </field>
     </record>
     
-        <!--  Partners inherited form -->
-        
-    <record id="view_phonecall_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.phonecall.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-               		<field name="meeting_ids" position="after">
-               			<field name="phonecall_ids" colspan="4" nolabel="1" />
-               		</field>
-            </field>
-        </record>
-    
     </data>
 </openerp>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
new file mode 100644
index 00000000000..93d865d7f74
--- /dev/null
+++ b/addons/crm/res_partner.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_partner(osv.osv):
+    """ Inherits partner and adds CRM information in the partner form """
+    _inherit = 'res.partner'
+    
+    _columns = {
+                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
+                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
+                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+                                                     'Meetings'), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
new file mode 100644
index 00000000000..540c8d13186
--- /dev/null
+++ b/addons/crm/res_partner_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+         <!--  Partners inherited form -->
+
+		<record id="view_crm_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.crm.info.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+               		<page string="CRM">
+						<field name="meeting_ids" colspan="4" nolabel="1" />
+						<field name="phonecall_ids" colspan="4" nolabel="1" />
+						<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+				                <field name="create_date"/>
+				                <field name="partner_name"/>
+				                <field name="name"/>
+				                <field name="email_from"/>
+				                <field name="phone"/>
+				
+				                <field name="categ_id" invisible="1"/>
+				                <field name="type_id" invisible="1"/>
+				                <field name="referred" invisible="1"/>
+				
+				                <field name="stage_id"/>
+				                <button name="stage_previous" string="Previous"
+				                    states="open,pending" type="object" icon="gtk-go-back" />
+				                <button name="stage_next" string="Next"
+				                    states="open,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <field name="section_id"
+				                    invisible="context.get('invisible_section', True)" />
+				                <field name="user_id" />
+				                <field name="state" />
+				                <button name="case_open" string="Open"
+				                    states="draft,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <button name="case_close" string="Close"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-close" />
+				                <button string="Convert to Opportunity"
+				                    name="convert_opportunity"
+				                    states="draft,open,pending" icon="gtk-index"
+				                    type="object" />
+				                <button name="case_escalate" string="Escalate"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-go-up" />
+				                <button name="case_cancel" string="Cancel"
+				                    states="draft,open,pending" type="object"
+				                    icon="gtk-cancel" />
+				            </tree>
+               			</field>
+					</page>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a824f279e28..2decc56b806 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -147,7 +147,6 @@ class crm_lead2partner(osv.osv_memory):
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
-                    function_id = self.pool.get('res.partner.function').search(cr,uid,[('name','=',lead.function_name)])
                     contact_id = contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
                         'name': lead.name,
@@ -156,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
                         'email': lead.email_from,
                         'fax': lead.fax,
                         'title': lead.title,
-                        'function': function_id and function_id[0] or False,
+                        'function': lead.function_name,
                         'street': lead.street,
                         'street2': lead.street2,
                         'zip': lead.zip,
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 0cd3b1c090c..4c285a7a0a7 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -21,6 +21,5 @@
 
 import idea
 import wizard
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index f013f37e853..0c4ede2506d 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -42,14 +42,34 @@
 	                        <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
 	                    	<field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
 	                	</group>                
-	                	<field name="to_ids" nolabel="1" colspan="4" mode="tree"  		default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
-	                    	<tree string="All Transitions" editable="bottom">
-	                        	<field name="activity_from_id"/>
-	                        	<field name="activity_to_id"/>
-	                        	<field name="interval_nbr"/>
-	                        	<field name="interval_type"/>
-	                    	</tree>
-                		</field>
+                        <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
+                             <form string="Out Transitions" >
+                                 <field name="activity_from_id" readonly="True"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </form>
+                             <tree string="Out Transitions" editable="bottom">
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </tree>
+                         </field> 
+                         <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
+                             <form string="In Transitions" >
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id" readonly="True"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </form>
+                             <tree string="In Transitions" editable="bottom">
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </tree>
+                         </field>
             		</form>
 		    		<tree string="All Activities">
                 		<field name="name" select="1"/>
@@ -143,7 +163,7 @@
                 	<newline/>
                 	<field name="ir_filter_id" select="1"/>
                 	<newline/>
-                	<field name="date_run" attrs="{'readonly':[('date_run','!=',False)]}"/>
+                	<field name="date_run" attrs="{'readonly':[('date_run','!=',False),('state','=','running')]}"/>
                 	<field name="date_done"/>
                 	<separator string="Synchronization" colspan="4" />
                		<field name="sync_last_date"/>
@@ -204,8 +224,7 @@
                 <field name="name" select="1" />
                 <field name="start"/>
                 <field name="campaign_id" select="1"/>
-                <field name="object_id" readonly="True"/>                
-                <field name="condition" colspan="4"/>
+                <field name="object_id" readonly="True"/>
                 <newline/>
                 <field name="type"/>
                 <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
@@ -222,14 +241,34 @@
                     <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
                     <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
                 </group>                
-                <field name="to_ids" nolabel="1" colspan="4" mode="tree,form">
-                    <tree string="All Transitions" editable="bottom">
-                        <field name="activity_from_id" />
-                        <field name="activity_to_id" />
-                        <field name="interval_nbr" />
-                        <field name="interval_type"/>
-                    </tree>
-                </field>
+                <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
+                     <form string="Out Transitions" >
+                         <field name="activity_from_id" readonly="True"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </form>
+                     <tree string="Out Transitions" editable="bottom">
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </tree>
+                 </field> 
+                 <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
+                     <form string="In Transitions" >
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id" readonly="True"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </form>
+                     <tree string="In Transitions" editable="bottom">
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </tree>
+                 </field>
             </form>
         </field>
     </record>
@@ -263,7 +302,7 @@
         <field name="view_id" ref="view_marketing_campaign_activity_tree"/>
     </record>
     
-   	<!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /-->
+   	<menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" />
     
     <!--
     ======================
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 04fc5980431..0815c74f276 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -291,7 +291,7 @@ class sale_order(osv.osv):
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and  self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
-        'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist.id,
+#        'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist.id,
     }
     _order = 'name desc'
 
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ad189ee546a..dc300994232 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -148,10 +148,10 @@ class product_product(osv.osv):
         return res
 
     def get_product_available(self,cr,uid,ids,context=None):
-        if not context:
+        if context is None:
             context = {}
-        states=context.get('states',[])
-        what=context.get('what',())
+        states = context.get('states',[])
+        what = context.get('what',())
         if not ids:
             ids = self.search(cr, uid, [])
         res = {}.fromkeys(ids, 0.0)
@@ -184,9 +184,9 @@ class product_product(osv.osv):
         # build the list of ids of children of the location given by id
         if context.get('compute_child',True):
             child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            location_ids= len(child_location_ids) and child_location_ids or location_ids
+            location_ids = child_location_ids or location_ids
         else:
-            location_ids= location_ids
+            location_ids = location_ids
 
         uoms_o = {}
         product2uom = {}