odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[ADD] cleaning code 

bzr revid: mva@openerp.com-20120113152454-ccutuvsv042oci16
This commit is contained in:
MVA 2012-01-13 16:24:54 +01:00
parent 0375bad8df
commit b64af0787a
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/event/board_association_view.xml
View File

@ -45,9 +45,9 @@
<action string="Next Events"
name="%(act_event_view)d"
domain="[('state','not in',('cancel','done'))]"/>
<action string="Unconfirmed Registrations"
<!--<action string="Unconfirmed Registrations"
name="%(event.act_event_list_register_event)d"
domain="[('state','=','draft')]"/>
domain="[('state','=','draft')]"/>-->
</column>
<column>
<action string="Events Filling Status"

9
addons/event/event.py
View File

@ -187,16 +187,9 @@ class event_event(osv.osv):
#change the description of the registration linked to this event
"""
if vals.get('mail_auto_confirm', False):
if vals['mail_auto_confirm']:
if 'mail_confirm' not in vals:
vals['mail_confirm'] = event.mail_confirm
else:
vals['mail_confirm'] = False
if 'mail_confirm' in vals:
register_values['description'] = vals['mail_confirm']
"""
if register_values:
reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)], context=context)
register_pool.write(cr, uid, reg_ids, register_values, context=context)

6
addons/event/event_demo.xml
View File

@ -99,7 +99,7 @@
<!-- Demo data for Event Registration-->
<record id="reg_1_1" model="event.registration">
<field name="event_id" ref="event_1"/>
<field name="partner_id" ref="base.res_partner_asus"/>
<field name="partner_id_address" ref="base.res_partner_asus"/>
<field name="partner_invoice_id" ref="base.res_partner_asus"/>
<field name="nb_register">5</field>
<field name="event_product">Ticket for Opera</field>
@ -108,7 +108,7 @@
<record id="reg_1_2" model="event.registration">
<field name="event_id" ref="event_1"/>
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="partner_id_address" ref="base.res_partner_agrolait"/>
<field name="partner_invoice_id" ref="base.res_partner_agrolait"/>
<field name="nb_register">10</field>
<field name="event_product">Ticket for Opera</field>
@ -119,7 +119,7 @@
<record id="reg_0_1" model="event.registration">
<field name="event_id" ref="event_0"/>
<field name="partner_id" ref="base.res_partner_c2c"/>
<field name="partner_id_address" ref="base.res_partner_c2c"/>
<field name="partner_invoice_id" ref="base.res_partner_c2c"/>
<field name="nb_register">6</field>
<field name="event_product">Ticket for Concert</field>

1
addons/event/event_view.xml
View File

@ -327,6 +327,7 @@
<separator string="partner" colspan="4"/>
<field name="partner_id_address" attrs="{'readonly':[('state','!=', 'draft')]}" required="1" on_change="onchange_partner_id(partner_id_address,event_id)" />
</group>
<group colspan="2" col="2">
<separator string="Registration Cost" colspan="4"/>