diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f1a9769f803..120f9651745 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
'res_partner_view.xml',
'email_template.xml',
],
- 'demo_xml': ['event_demo.xml'],
+ 'demo_xml': ['event_demo.yml'],
'test': ['test/process/event_draft2done.yml'],
'css': ['static/src/css/event.css'],
'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 09495560051..72c28b3315f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -424,7 +424,6 @@ class event_registration(osv.osv):
contact_id = addr_obj.browse(cr, uid, contact, context=context)
data = {
'email':contact_id.email,
- 'contact_id':contact_id.id,
'name':contact_id.name,
'phone':contact_id.phone,
}
@@ -444,13 +443,12 @@ class event_registration(osv.osv):
end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
diff = end - start
duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
- value['duration'] = round(duration, 2)
- return {'value': {'event_begin_date': data_event.date_begin,
+ value ['value']= {'event_begin_date': data_event.date_begin,
'event_end_date': data_event.date_end,
'company_id': data_event.company_id and data_event.company_id.id or False,
- 'duration': value['duration'],
- }
+ 'duration': round(duration, 2),
}
+ return value
def onchange_partner_id(self, cr, uid, ids, part, context=None):
res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Seminar
-
-
-
- Exhibition
-
-
-
- Conference
-
-
-
- Show
-
-
-
- Training
-
-
-
-
- Concert of Bon Jovi
-
-
- 500
-
-
-
-
- Opera of Verdi
-
-
-
- 50
- 350
-
-
- Conference on ERP Business
-
-
-
- 200
-
-
-
-
-
-
- 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
-
-
-
-
-
- Camptocamp
- openerp@camptocamp.com
- +41 21 619 10 04
-
-
- 5
-
-
-
-
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..f4e5cf04495
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+ from datetime import datetime, timedelta
+-
+ !record {model: event.type, id: event_type_0}:
+ name: 'Seminar'
+-
+ !record {model: event.type, id: event_type_1}:
+ name: 'Exhibition'
+-
+ !record {model: event.type, id: event_type_2}:
+ name: 'Conference'
+-
+ !record {model: event.type, id: event_type_3}:
+ name: 'Show'
+-
+ !record {model: event.type, id: event_type_4}:
+ name: 'Training'
+-
+ !record {model: event.event, id: event_0}:
+ name: 'Concert of Bon Jovi'
+ date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+ date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+ register_max: 500
+ type: event_type_1
+-
+ !record {model: event.event, id: event_1}:
+ name: 'Opera of Verdi'
+ date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+ date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+ register_min: 50
+ register_max: 350
+ type: event_type_1
+-
+ !record {model: event.event, id: event_2}:
+ name: 'Conference on ERP Business'
+ date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
+ date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+ register_min: 50
+ register_max: 350
+ type: event_type_2
+-
+ !record {model: event.registration, id: reg_1_1}:
+ name: 'Agrolait'
+ email: 's.l@agrolait.be'
+ phone: '003281588558'
+ event_id: event_1
+ partner_id: base.res_partner_asus
+ nb_register: 5
+-
+ !record {model: event.registration, id: reg_1_2}:
+ name: 'ASUStek'
+ email: 'info@asustek.com'
+ phone: '+ 1 64 61 04 01'
+ event_id: event_1
+ partner_id: base.res_partner_asus
+ nb_register: 10
+-
+ !record {model: event.registration, id: reg_0_1}:
+ name: 'Syleam'
+ email: 'contact@syleam.fr'
+ phone: '+33 (0) 2 33 31 22 10'
+ event_id: event_0
+ partner_id: base.res_partner_sednacom
+ nb_register: 6
+-
+ !record {model: event.registration, id: reg_0_2}:
+ name: 'Camptocamp'
+ email: 'openerp@camptocamp.com'
+ phone: '+41 21 619 10 04'
+ event_id: event_2
+ partner_id: base.res_partner_c2c
+ nb_register: 5
+
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0b424b9794b..f3564048b55 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -387,7 +387,7 @@
-
+