From ec2ea6643b86928859a02efd14d328523ab80e1f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 10 Apr 2014 11:17:47 +0200
Subject: [PATCH] [IMP] evnet

bzr revid: fp@tinyerp.com-20140410091747-mznpvuxdbi1uxj2d
---
 addons/event/event_view.xml           | 54 +++++++++++++--------------
 addons/event_sale/event_sale_view.xml | 24 ++++++++++++
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 07a36ea3a6b..3669b5a1e6f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -105,9 +105,9 @@
                                         <field name="phone"/>
                                         <field name="nb_register" />
                                         <field name="state"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                                     </tree>
                                     <form string="Registration">
                                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
@@ -125,9 +125,9 @@
                                                 <separator string="" colspan="4"/>
                                                 <newline/>
                                                 <field name="state" colspan="2"/>
-                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                                             </group>
                                     </form>
                                 </field>
@@ -263,21 +263,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
-                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
+                    <filter string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
+                    <filter string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                     <separator/>
-                    <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
+                    <filter string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
+                    <filter string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
                     <field name="type"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
-                        <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <filter string="Start Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_begin'}"/>
+                        <filter string="Responsible" context="{'group_by': 'user_id'}"/>
+                        <filter string="Event Type" context="{'group_by':'type'}"/>
+                        <filter string="Status" context="{'group_by':'state'}"/>
+                        <filter string="Start Month" domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
             </field>
@@ -333,9 +333,9 @@
                     <field name="origin"/>
                     <field name="state"/>
                     <field name="message_unread" invisible="1"/>
-                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <button name="registration_open" string="Confirm Registration" states="draft" type="object"/>
+                    <button name="button_reg_close" string="Attended the Event" states="open" type="object"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                 </tree>
             </field>
         </record>
@@ -367,7 +367,7 @@
                                     <field name="email" class="oe_inline"/>
                                     <button class="oe_inline oe_right" string="Send Email"
                                         name="%(mail.action_email_compose_message_wizard)d"
-                                        icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                        context= '{"default_email_to":email}' type="action"/>
                                 </div>
                             </group>
                             <group>
@@ -420,20 +420,20 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|',('name','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
-                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
+                    <filter string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
+                    <filter string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                     <separator/>
-                    <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
+                    <filter string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
                     <field name="event_id"/>
                     <field name="user_id"/>
                     <field name="partner_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Responsible"  domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Event" name="group_event" domain="[]" context="{'group_by':'event_id'}"/>
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                    </group>
                 </search>
             </field>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 821a4c19b83..1d830198234 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -17,6 +17,30 @@
              </field>
         </record>
 
+        <record model="ir.ui.view" id="view_event_registration_ticket_search">
+            <field name="name">event.registration.ticket.search</field>
+            <field name="model">event.registration</field>
+            <field name="arch" type="xml">
+            <field name="inherit_id" ref="event.view_registration_search" />
+            <field name="arch" type="xml">
+                <filter name="group_event" position="after">
+                    <filter string="Ticket Type" domain="[]" context="{'group_by':'event_ticket_id'}"/>
+                </filter>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_event_registration_ticket_tree">
+            <field name="name">event.registration.ticket.tree</field>
+            <field name="model">event.registration</field>
+            <field name="arch" type="xml">
+            <field name="inherit_id" ref="event.view_event_registration_tree" />
+            <field name="arch" type="xml">
+                <field name="event_id" position="after">
+                    <field name="event_ticket_id"/>
+                </field>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="event_sale_product_template_form">
              <field name="model">product.template</field>
              <field name="inherit_id" ref="product.product_template_form_view" />