[merge]merge with the trunk

bzr revid: mva@openerp.com-20120124151843-miimna96ypu9s9si
2012-01-24 16:18:43 +01:00
parent c55271b43f
commit 240a44c989
2 changed files with 2 additions and 2 deletions
@@ -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">
@@ -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,