[MERGE] merge with new trunk
[odoo/odoo.git] / addons / event / event_view.xml
index 31fb353..0891caf 100644 (file)
@@ -5,6 +5,7 @@
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
 
+
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
         <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
 
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
+
+                    
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" widget="selection"/>
-                        <field name="language"/>
-                        <field name="parent_id"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
-                        <group colspan="4" col="4">
-                            <separator string="Invoice Information" colspan="4"/>
-                            <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
-                            <field name="unit_price"/>
-                            <field name="pricelist_id" widget="selection" domain="[('type','=','sale')]" groups="base.group_extended"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="user_id"/>
-                            <field name="section_id" widget="selection" on_change="do_team_change(section_id)"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Location" colspan="4"/>
-                            <field name="country_id" />
-                            <field name="address_id" domain="[('country_id','=',country_id)]"/>
 
-                        </group>
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="state" select="1"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel" type="object" icon="gtk-convert"/>
-                        </group>
-                    </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Registrations">
-                        <field name="register_min"/>
-                        <field name="register_max"/>
-                        <field name="register_current"/>
-                        <field name="register_prospect"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" readonly="1">
-                            <form string="Registration">
-                                <field name="name"/>
-                                <field name="date" string="Date"/>
-                                <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                                <group colspan="4" col="4">
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
-                                    <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
-                                </group>
+                        <field name="registration_ids" colspan="4" nolabel="1" >
+                            <form string="Registration" >
+                            <group colspan="4" col="4">    
+                            <separator string="partner" colspan="4"/>
+
+                            <field name="name"/>
+                            </group>
+                            <group colspan="4" col="4">
+                            <field name="street"/>
+                            <field name="city"/>
+                            </group>
+                            <group colspan="4" col="4">
+                            <field name="email"/>
+                            <field name="phone"/>
+                            </group>
+                            <group colspan="4" col="4">
+                                <field name="unit_price"/>
+                                <field name="nb_register"/>
+                            </group>
+                            <group colspan="4" col="4">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id_address,event_id)" />
+                            </group>
                                 <group col="8" colspan="4">
                                     <separator string="" colspan="4"/>
                                     <newline/>
                                 </group>
                             </form>
                             <tree string="Registration">
-                                    <field name="create_date" string="Registration Date"/>
-                                    <field name="partner_id" required="1" string="Partner" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
+                                    <field name="create_date" string="Registration Date" invisible="1"/>
+                                    <field name="name" />
+                                    <field name="email" />
+                                    <field name="nb_register" />
                                     <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal" invisible="1"/>
                                     <field name="state"/>
                                     <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                     <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </tree>
-                        </field>
+                            </field> 
+
+                        <field name="state" select="1" widget="statusbar"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Mailing">
-                        <field name="reply_to" />
-                        <newline/>
+                    <page string="Extra Info">
+                     
+                        <field name="register_min"/>
+                        <field name="register_max"/>
+                        <field name="register_current"/>
+                        <field name="register_prospect"/>
+
+                    <separator string="Emails" colspan="4"/>                                                 
                         <group col="4" colspan="4">
                             <group col="2" colspan="2">
-                                <separator string="Auto Registration Email" colspan="4"/>
-                                <field name="mail_auto_registr" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_registr','=',False)]}">
-                                    <separator string="Registration Email Body" colspan="4"/>
-                                    <field name="mail_registr" colspan="4" nolabel="1" />
-                                </group>
+                                <field name="email_registration_id" domain="[('model_id','=','Event Registration')]"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Auto Confirmation Email" colspan="4"/>
-                                <field name="mail_auto_confirm" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_confirm','=',False)]}">
-                                    <separator string="Confirmation Email Body" colspan="4"/>
-                                    <field name="mail_confirm" nolabel="1" colspan="4"/>
-                                </group>
+                                <field name="email_confirmation_id"/>
                             </group>
                         </group>
                     </page>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Registration">
-                    <field name="partner_id"/>
+                <tree string="Registration" >
+                    <field name="name"/>
+                    <field name="email"/>
                     <field name="event_id"/>
-                    <field name="nb_register"/>
-                    <field name="price_subtotal" sum="Total"/>
+                    <field name="nb_register" invisible="1"/>
+                    <field name="unit_price"/>
                     <field name="user_id"/>
                     <field name="state"/>
                     <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                 <form string="Registration">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="create_date" string="Registration Date"/>
-                        <field name="name"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
+                        <field name="date" />
+                        <field name="date_deadline" />
+                        <field name="origin"/>
                         <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}" />
-                        <field name="tobe_invoiced"/>
+
                     </group>
                     <notebook colspan="4">
                         <page string="Registration">
-                            <field name="date" />
-                            <field name="date_deadline" />
+                            <group colspan="2" col="2">
+                            <separator string="Registration contact" colspan="4"/>  
+                            <group colspan="2" col="2">
+                            <field name="name"/>
+                            </group>
+                            <group colspan="4" col="4">
+                            <field name="street"/>
+                            <field name="city"/>
+                            <field name="email"/>
+                            <field name="phone"/>
+                            </group>
+                            <group colspan="2" col="2">    
+                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id_address,event_id)" />
+                            </group>
+                            </group>
                             <group colspan="2" col="2">
                                 <separator string="Registration Cost" colspan="4"/>
-                                <field name="nb_register"/>
                                 <field name="unit_price"/>
+                                <field name="nb_register"/>
                                 <field name="price_subtotal"/>
-                            </group>
-                            <group colspan="2" col="2" attrs="{'invisible':[('tobe_invoiced','=',False)]}">
-                                <separator string="Invoice" colspan="4"/>
-                                <field name="event_product" attrs="{'required':[('tobe_invoiced','=',True)]}"/>
-                                <field name="partner_invoice_id" attrs="{'required':[('tobe_invoiced','=',True)]}" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
                                 <field name="invoice_id"/>
-                           </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            </group>
+                            
+
                             <separator string="" colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1" colspan="2"/>
+                                <field name="state" select="1" colspan="2" widget="statusbar"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                 <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                             </group>
                         </page>
                         <page string="Extra Info">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
-                            <field name="email_from"/>
-                            <field name="badge_ids" colspan="4" nolabel="1">
-                                <tree string="Badges" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </tree>
-                                <form string="Badges">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </form>
-                            </field>
+
                             <group col="2" colspan="2" groups="base.group_extended">
                                <separator string="Dates" colspan="2"/>
                                <field name="date_closed"/>
+                               <field name="create_date" string="Registration Date"/>
                             </group>
                             <group col="2" colspan="2" groups="base.group_extended">
                                <separator string="Misc" colspan="2"/>
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" type="action"/>
                            </page>
+
                     </notebook>
                 </form>
             </field>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
-                        <field name="event_id" widget="selection"/>
+                        <field name="event_id" widget="seemaillection"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Registrations"
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'registration_state'}"/>
                    </group>
+
                 </search>
             </field>
         </record>
             action="action_registration"/>
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
+        
+
+
+
+
+        
+        
     </data>
 </openerp>