diff options
| author | Olivier Dony <odo@openerp.com> | 2014-01-28 19:57:36 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-01-28 19:57:36 +0100 |
| commit | 52b811b7f9f4201cea8103413b3ce94c4d41156e (patch) | |
| tree | dad8e3724cf01e99fb9118779b3ce308bc6ba628 | |
| parent | e54cb0291a5f342ca8ee24f4d93ee860b165fb1c (diff) | |
[FIX] Incomplete merge during previous trunk sync
bzr revid: odo@openerp.com-20140128185736-p5s5oujsju1mj88k
| -rw-r--r-- | addons/event/report/report_event_registration.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 6c2f4af3ad3..72d7a810612 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -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 ) """) |