[merge]merge with the trunk

bzr revid: mva@openerp.com-20120124150700-sj36s8ahqsmvjwke
This commit is contained in:
MVA 2012-01-24 16:07:00 +01:00
parent 2259d247a0
commit c55271b43f
1 changed files with 1 additions and 2 deletions

View File

@ -70,7 +70,6 @@ class report_event_registration(osv.osv):
r.name AS name_registration,
e.section_id AS section_id,
e.company_id AS company_id,
e.product_id AS product_id,
e.main_speaker_id AS speaker_id,
to_char(e.date_begin, 'YYYY') AS year,
to_char(e.date_begin, 'MM') AS month,
@ -105,7 +104,7 @@ class report_event_registration(osv.osv):
e.section_id,
event_state,
e.company_id,
e.product_id,
e.main_speaker_id,
year,
month,