odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Incomplete merge during previous trunk sync 

bzr revid: odo@openerp.com-20140128185736-p5s5oujsju1mj88k
This commit is contained in:
Olivier Dony 2014-01-28 19:57:36 +01:00
parent e54cb0291a
commit 52b811b7f9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/event/report/report_event_registration.py
View File

@ -58,7 +58,6 @@ class report_event_registration(osv.osv):
r.user_id AS user_id_registration,
r.name AS name_registration,
e.company_id AS company_id,
e.main_speaker_id AS speaker_id,
e.date_begin AS event_date,
count(e.id) AS nbevent,
CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
@ -84,8 +83,6 @@ class report_event_registration(osv.osv):
event_state,
e.company_id,
e.seats_max,
e.main_speaker_id,
e.register_max,
name_registration
)
""")