diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 1fc33b433b5..0e1e4e0dd3a 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@ Note that:
Association / Configuration / Types of Events
""",
'author': 'OpenERP SA',
- 'depends': ['crm', 'account', 'marketing', 'mail'],
+ 'depends': ['crm', 'account', 'marketing', 'email_template'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
@@ -51,6 +51,7 @@ Note that:
'wizard/partner_event_registration_view.xml',
'board_association_view.xml',
'res_partner_view.xml',
+ 'email_template.xml',
],
'demo_xml': ['event_demo.xml'],
'test': [],
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 4ab56b68925..a795fd2d7ab 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -4,6 +4,10 @@
+
+
+
+
68.00
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 0ccf391442c..118c20f8761 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -45,10 +45,10 @@ class report_event_registration(osv.osv):
'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
+ 'user_id_registration': fields.many2one('res.users', 'Register', readonly=True),
'name_registration': fields.char('Register',size=45, readonly=True),
'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
- 'product_id': fields.many2one('product.product', 'Product', 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),
}
@@ -104,7 +104,6 @@ class report_event_registration(osv.osv):
e.section_id,
event_state,
e.company_id,
-
e.main_speaker_id,
year,
month,
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 226e14e51fb..c1d98ac2c1a 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -22,11 +22,12 @@
+
-
+
@@ -98,13 +99,14 @@
-
+
+
-
+
@@ -117,13 +119,14 @@
domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
-
-
-
-
+
+
+
+
+