[MERGE] merge with new trunk

[odoo/odoo.git] / addons / event / report / report_event_registration.py

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 3ef6ecb..52104e8 100644 (file)
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -29,7 +29,7 @@ class report_event_registration(osv.osv):
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.date('Event Start Date', readonly=True),
+        'event_date': fields.date('Event Start Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -39,16 +39,18 @@ class report_event_registration(osv.osv):
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
         'nbevent': fields.integer('Number Of Events'),
-        'type': fields.many2one('event.type', 'Event Type'),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
+        'event_type': fields.many2one('event.type', 'Event Type'),
+        '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),
     }
-    _order = 'date desc'
+    _order = 'event_date desc'
     def init(self, cr):
         """
         initialize the sql view for the event registration
@@ -58,75 +60,54 @@ class report_event_registration(osv.osv):
         cr.execute("""
          CREATE OR REPLACE view report_event_registration AS (
                 SELECT
-                id,
                 event_id,
-                date,
-                user_id,
-                section_id,
-                company_id,
-                product_id,
-                speaker_id,
-                year,
-                month,
-                nbevent,
-                type,
-                SUM(draft_state) AS draft_state,
-                SUM(confirm_state) AS confirm_state,
-                SUM(total) AS total,
-                register_max,
-                state
-                FROM(
-                SELECT
-                MIN(e.id) AS id,
-                e.id AS event_id,
-                e.date_begin AS date,
+                r.id,
+                e.date_begin AS event_date,
                 e.user_id AS user_id,
+                r.user_id AS user_id_registration,
+                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,
                 count(e.id) AS nbevent,
-                t.id AS type,
-                CASE WHEN c.state IN ('draft') THEN c.nb_register ELSE 0 END AS draft_state,
-                CASE WHEN c.state IN ('open','done') THEN c.nb_register ELSE 0 END AS confirm_state,
-                CASE WHEN c.state IN ('done') THEN c.price_subtotal ELSE 0 END AS total,
+                CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
+                CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
+                e.type AS event_type,
                 e.register_max AS register_max,
-                e.state AS state
+                e.state AS  event_state,
+                r.state AS  registration_state
                 FROM
                 event_event e
+                
                 LEFT JOIN
-                    event_registration c ON (e.id=c.event_id)
-                LEFT JOIN
-                    event_type t ON (e.type=t.id)
-                WHERE c.active = 'true'
+                    event_registration r ON (e.id=r.event_id)
+
+                WHERE r.active = 'true'
+               
                GROUP BY
-                    to_char(e.date_begin, 'YYYY'),
-                    to_char(e.date_begin, 'MM'),
-                    c.state,
-                    c.nb_register,
-                    t.id, e.id, e.date_begin, e.main_speaker_id,
-                    e.register_max, e.type, e.state, c.event_id, e.user_id,e.company_id,e.product_id,e.section_id,
-                    to_char(e.date_begin, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo
-                GROUP BY
-                id,
                 event_id,
-                date,
-                user_id,
-                section_id,
-                company_id,
-                product_id,
-                speaker_id,
+                user_id_registration,
+                e.id,
+                r.id,
+                registration_state,
+                r.nb_register,
+                event_type, e.id, e.date_begin, e.main_speaker_id,
+                e.register_max,event_id, e.user_id,e.company_id,e.section_id,
+                e.user_id,
+                e.section_id,
+                event_state,
+                e.company_id,
+                e.main_speaker_id,
                 year,
                 month,
-                nbevent,
-                type,
-                register_max,
-                state
+                e.register_max,
+                name_registration
+
               )
                 """)
 
 report_event_registration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: