[REF] remove product id from the report view

bzr revid: mva@openerp.com-20120125103546-qjh1p3bpl8fc0wyv

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': [],

addons/event/event_demo.xml

@@ -4,6 +4,10 @@
     <record id="base.user_demo" model="res.users">
              <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
      </record>
+     
+     
+
+     
 <!-- Demo Data for Product -->
 	<record id="event_product_0" model="product.product">
 		<field name="list_price">68.00</field>

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,

addons/event/report/report_event_registration_view.xml

@@ -22,11 +22,12 @@
                     <field name="confirm_state"/>
                     <field name="registration_state" invisible="1"/>
                     <field name="name_registration" invisible="1"/>
+                    <field name="user_id_registration" invisible="1"/>
                     <field name="price_subtotal"/>
                     <field name="average_subtotal"/>
                     <field name="register_max" invisible="context.get('max_reg_event_visible', True)"/>
                     <field name="company_id" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
+
                     <field name="section_id" invisible="1"/>
                     <field name="total" invisible="context.get('total_invisible', True)" sum="Total"/>
                 </tree>
@@ -98,13 +99,14 @@
                     </group>
                     <newline/>
 
-                    <group expand="1" string="Group By Event...">
+                    <group expand="1" string="Group By...">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
+                        <filter string="Participant" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
-                        <filter string="Product"  icon="terp-accessories-archiver" context="{'group_by': 'product_id'}"/>
+                        
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
                         <filter string="event_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}" help="Events States"/>
@@ -117,13 +119,14 @@
                             domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By Registration...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}" help="Events States"/>
-                        <filter string="name" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
+                        <filter string="name of the register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact"/>
 
                     </group>
+
+
+
+
                 </search>
             </field>
         </record>