From 240a44c989d091070324124cbad4fe4f025484d1 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Tue, 24 Jan 2012 16:18:43 +0100
Subject: [PATCH] [merge]merge with the trunk

bzr revid: mva@openerp.com-20120124151843-miimna96ypu9s9si
---
 addons/event/event_view.xml                      | 2 +-
 addons/event/report/report_event_registration.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1ec2b89625e..3da534bb651 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -60,7 +60,7 @@
                         <field name="date_end"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id"/>
-                        <field name="address_id" domain="[('country_id','=',country_id)]"/>
+                        <field name="address_id" />
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index b6863db901f..0ccf391442c 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -99,7 +99,7 @@ class report_event_registration(osv.osv):
                 registration_state,
                 r.nb_register,
                 event_type, e.id, e.date_begin, e.main_speaker_id,
-                e.register_max,event_id, e.user_id,e.company_id,e.product_id,e.section_id, r.price_subtotal,
+                e.register_max,event_id, e.user_id,e.company_id,e.section_id, r.price_subtotal,
                 e.user_id,
                 e.section_id,
                 event_state,