diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 79024e03b7f..28f52bbc734 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -48,7 +48,6 @@ class report_event_registration(osv.osv): 'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'total': fields.float('Total'), - 'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True), } _order = 'event_date desc' def init(self, cr): @@ -93,9 +92,8 @@ 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.section_id, + e.register_max,event_id, e.user_id,e.company_id, e.user_id, - e.section_id, event_state, e.company_id, e.main_speaker_id, diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 62a2e143fdf..6e1afad520f 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -25,7 +25,6 @@ - @@ -100,7 +99,6 @@ - diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml index 2f48cf1a90b..0fbb2bfa676 100644 --- a/addons/event/test/ui/demo_data.yml +++ b/addons/event/test/ui/demo_data.yml @@ -10,7 +10,6 @@ - !record {model: event.event, id: event_2}: product_id: event_product_2 - section_id: crm.section_sales_department name: 'Conference on ERP Buisness' - I call onchange event from event registration wizard. diff --git a/addons/event_sale_order/test/confirm.yml b/addons/event_sale_order/test/confirm.yml index b288189818f..69d84e8be7b 100644 --- a/addons/event_sale_order/test/confirm.yml +++ b/addons/event_sale_order/test/confirm.yml @@ -8,45 +8,3 @@ type: service event_ok: True event_type_id: 1 -- - create a sale order -- - !record {model: sale.order, id: order}: - partner_id: base.res_partner_agrolait - note: Invoice after delivery - payment_term: account.account_payment_term -- - create sale order line from the sale order with the product -- - !record {model: event.event,id: event}: - name: test_event - type: 1 - date_end: '2012-01-01 19:05:15' - date_begin: '2012-01-01 18:05:15' -- - !record {model: sale.order.line, id: line}: - product_id: event_product - price_unit: 190.50 - product_uom_qty: 8 - order_id: order - name: sale order line - event: event -- - confirm the sale order -- - !workflow {model: sale.order, ref: order, action: order_confirm} -- - check if sale order is confirmed -- - !assert {model: sale.order, id: order}: - - state == 'confirmed' -- - check if a registration is created -- - !python {model: event.registration}: | - order_id = ref('order') - order = self.pool.get('sale.order').browse(cr, uid,order_id) - registration_ids = self.search(cr,uid,[('origin','=',order.name)]) - if registration_ids == []: - raise osv.except_osv(_('Error!'),_("The registration is not created")) -