From 521e73a6795a9dc76af319b0e06979bf4c95977a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 22 Dec 2013 16:02:29 +0100 Subject: [PATCH] [IMP] Event tracks, not finished bzr revid: fp@tinyerp.com-20131222150229-mhukvwlis5nzbmpl --- .../website_event_track/data/event_demo.xml | 2 +- addons/website_event_track/models/event.py | 4 ++-- .../views/event_backend.xml | 5 ++++- .../views/website_event.xml | 19 ++++++++++--------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index c8f243bb092..3b4690a08e6 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -85,7 +85,7 @@ A Better Future With OpenERP eCommerce - + 2014-12-01 10:00:00 diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index b7d8224a559..d6895b3c70f 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -76,7 +76,7 @@ class event_track(osv.osv): 'stage_id': fields.many2one('event.track.stage'), 'description': fields.html('Track Description'), 'date': fields.datetime('Track Date'), - 'duration': fields.float('Duration (Hours)'), + 'duration': fields.integer('Duration'), 'location_id': fields.many2one('event.track.location', 'Location'), 'show_attachments': fields.boolean('Show Documents'), 'event_id': fields.many2one('event.event', 'Event', required=True), @@ -97,7 +97,7 @@ class event_track(osv.osv): 'user_id': lambda self, cr, uid, ctx: uid, 'website_published': lambda self, cr, uid, ctx: False, 'show_attachments': lambda self, cr, uid, ctx: True, - 'duration': lambda *args: 0, + 'duration': lambda *args: 60, 'stage_id': _default_stage_id, 'priority': '2' } diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml index d11da948aab..b2f31cf5459 100644 --- a/addons/website_event_track/views/event_backend.xml +++ b/addons/website_event_track/views/event_backend.xml @@ -312,7 +312,10 @@ - + diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index da43eefcfae..9790a5d5652 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -116,20 +116,21 @@ - -
- Responsible
-
- Speakers
-
Date

Duration
-
+ minutes
Location

- Stage
-
+
+ +
+
+

Speakers

+
+
+ Speakers
+