diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e4c810fa6be..5b71bb57a34 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -958,16 +958,7 @@ class account_invoice(osv.osv):
             pc = pr = 0.0
             cr.execute('select sum(quantity*price_unit) from account_invoice_line where invoice_id=%s', (inv['id'],))
             total = inv['amount_untaxed']
-            if inv['type'] in ('in_invoice','in_refund'):
-                partnertype='supplier'
-                eventtype = 'purchase'
-                pc = total*factor
-            else:
-                partnertype = 'customer'
-                eventtype = 'sale'
-                pr = total*factor
-            if self.pool.get('res.partner.event.type').check(cr, uid, 'invoice_open'):
-                self.pool.get('res.partner.event').create(cr, uid, {'name':'Invoice: '+name, 'som':False, 'description':name+' '+str(inv['id']), 'document':name, 'partner_id':part, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'canal_id':False, 'user_id':uid, 'partner_type':partnertype, 'probability':1.0, 'planned_revenue':pr, 'planned_cost':pc, 'type':eventtype})
+            self.pool.get('res.partner.event').create(cr, uid, {'name':'Invoice: ' + name, 'description':name+' '+str(inv['id']), 'partner_id':part, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid})
         return len(invs)
 
     def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e434f28d947..ee1bbbbcc4b 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -132,11 +132,13 @@
             <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>
+                <xpath expr="//notebook[last()]" position="after">
+	                <notebook colspan="4">
+	                    <page string="Project">
+	                        <field name="contract_ids" colspan="4" nolabel="1" />
+	                    </page>
+	                </notebook>
+                </xpath>
             </field>
         </record>
         
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index cfff95888cc..1873f53f573 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,59 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        
-        <record id="event_type_case_create" model="res.partner.event.type">
-            <field name="name">CRM: Create Case</field>
-            <field name="key">crm_case_draft</field>
-        </record>
-        
-        <record id="event_type_case_open" model="res.partner.event.type">
-            <field name="name">CRM: Open Case</field>
-            <field name="key">crm_case_open</field>
-        </record>
-        
-        <record id="event_type_case_pending" model="res.partner.event.type">
-            <field name="name">CRM: Pending Case</field>
-            <field name="key">crm_case_pending</field>
-        </record>
-        
-        <record id="event_type_case_cancel" model="res.partner.event.type">
-            <field name="name">CRM: Cancel Case</field>
-            <field name="key">crm_case_cancel</field>
-        </record>
-        
-        <record id="event_type_case_close" model="res.partner.event.type">
-            <field name="name">CRM: Close Case</field>
-            <field name="key">crm_case_done</field>
-        </record>
-        
-    </data>
-    
     <data noupdate="1">
 		<record model="crm.case.section" id="section_sales_department">
 			<field name="name">Sales Department</field>
 			<field name="code">Sales</field>
 		</record>
         
-        <record id="event_type_case_create" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
-        
-        <record id="event_type_case_open" model="res.partner.event.type">
-            <field eval="True" name="active"/>
-        </record>
-        
-        <record id="event_type_case_pending" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
-        
-        <record id="event_type_case_close" model="res.partner.event.type">
-            <field eval="True" name="active"/>
-        </record>
-        
-        <record id="event_type_case_cancel" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
         
         <record id="ir_cron_crm_action" model="ir.cron">
             <field name="name">Check cases rules</field>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 93d865d7f74..3d2dc0373a5 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -27,10 +27,12 @@ class res_partner(osv.osv):
     
     _columns = {
                 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
+                                        'Opportunities', readonly=True, \
+                                        domain=[('type', '=', 'opportunity')]), 
                 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-                                                     'Meetings'), 
-                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                                        'Meetings', readonly=True), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
+                                        'Phonecalls', readonly=True), 
                 }
 
 res_partner()
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 540c8d13186..24523f7b072 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -10,52 +10,54 @@
             <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>
+                <xpath expr="//notebook[last()]" position="after">
+                    <notebook colspan="4">
+		               		<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>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 849e586335c..37e69ddc2d0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -264,9 +264,7 @@ class purchase_order(osv.osv):
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         todo = []
         for po in self.browse(cr, uid, ids):
-            
-            if self.pool.get('res.partner.event.type').check(cr, uid, 'purchase_open'):
-                self.pool.get('res.partner.event').create(cr, uid, {'name':'Purchase Order: '+po.name, 'partner_id':po.partner_id.id, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid, 'partner_type':'retailer', 'probability': 1.0, 'planned_cost':po.amount_untaxed})
+            self.pool.get('res.partner.event').create(cr, uid, {'name':'Purchase Order: '+po.name, 'partner_id':po.partner_id.id, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid})
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
             for line in po.order_line:            
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 0a6659d244f..2b57a2a75bc 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -7,11 +7,6 @@
             <field name="object">purchase.order</field>
         </record>
         
-        <record id="event_type_purchase_open" model="res.partner.event.type">
-            <field name="name">Purchase: Purchase Confirmation</field>
-            <field name="key">purchase_open</field>
-        </record>
-        
         <record id="pricelist_type_purchase" model="product.pricelist.type">
             <field name="name">Purchase Pricelist</field>
             <field name="key">purchase</field>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index e1a8998e1d3..2be5a50ff81 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -9,16 +9,6 @@
             <field name="object">sale.order</field>
         </record>
         
-        <!--
-	Partner event type 
-	-->
-        <record id="event_type_sale_open" model="res.partner.event.type">
-            <field name="name">SALE: Sale Confirmation</field>
-            <field name="key">sale_open</field>
-        </record>
-        
-        
-        
         <!--
 	Resource: sale.shop
 	-->