diff --git a/addons/event/event.py b/addons/event/event.py
index 94959bdcb1f..6c3e2ddfe39 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -217,7 +217,7 @@ class event_registration(osv.osv):
"""Event Registration"""
_name= 'event.registration'
_description = __doc__
- _inherit = ['mail.thread','res.partner.address']
+ _inherit = ['mail.thread','res.partner']
_columns = {
'id': fields.integer('ID'),
'origin': fields.char('Origin', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -225,8 +225,6 @@ class event_registration(osv.osv):
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
- 'partner_address_id': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}),
- "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}),
'create_date': fields.datetime('Creation Date' , readonly=True),
'date_closed': fields.datetime('Attended Date', readonly=True),
'date_open': fields.datetime('Registration Date', readonly=True),
@@ -310,7 +308,7 @@ class event_registration(osv.osv):
data ={}
if not contact:
return data
- addr_obj = self.pool.get('res.partner.address')
+ addr_obj = self.pool.get('res.partner')
contact_id = addr_obj.browse(cr, uid, contact, context=context)
data = {
'email':contact_id.email,
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 0dfbbf6de18..f9ef6e2dd6d 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -59,17 +59,29 @@
+ Agrolait
+ s.l@agrolait.be
+ 003281588558
+
5
+ ASUStek
+ info@asustek.com
+ + 1 64 61 04 01
+
10
+ Syleam
+ contact@syleam.fr
+ +33 (0) 2 33 31 22 10
+
6
@@ -77,6 +89,9 @@
+ Camptocamp
+ openerp@camptocamp.com
+ +41 21 619 10 04
5
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 88be188080e..81e9f900009 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -286,7 +286,6 @@
-
@@ -378,7 +377,7 @@
+ filter_domain="['|','|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>