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

[IMP]event: remove res.partner.address and change demo 

bzr revid: kjo@tinyerp.com-20120320114525-ecw4lgday9cp2huv
This commit is contained in:
Kuldeep Joshi (OpenERP) 2012-03-20 17:15:25 +05:30
parent 14cd8fd357
commit e90535a6ae
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/event/event.py
View File

@ -217,7 +217,7 @@ class event_registration(osv.osv):
"""Event Registration"""
_name= 'event.registration'
_description = __doc__
_inherit = ['mail.thread','res.partner.address']
_inherit = ['mail.thread','res.partner']
_columns = {
'id': fields.integer('ID'),
'origin': fields.char('Origin', size=124,readonly=True,help="Name of the sale order which create the registration"),
@ -225,8 +225,6 @@ class event_registration(osv.osv):
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
'partner_address_id': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}),
"contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}),
'create_date': fields.datetime('Creation Date' , readonly=True),
'date_closed': fields.datetime('Attended Date', readonly=True),
'date_open': fields.datetime('Registration Date', readonly=True),
@ -310,7 +308,7 @@ class event_registration(osv.osv):
data ={}
if not contact:
return data
addr_obj = self.pool.get('res.partner.address')
addr_obj = self.pool.get('res.partner')
contact_id = addr_obj.browse(cr, uid, contact, context=context)
data = {
'email':contact_id.email,

15
addons/event/event_demo.xml
View File

@ -59,17 +59,29 @@
<!-- Demo data for Event Registration-->
<record id="reg_1_1" model="event.registration">
<field name="name">Agrolait</field>
<field name="email">s.l@agrolait.be</field>
<field name="phone">003281588558</field>
<field name="event_id" ref="event_1"/>
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="nb_register">5</field>
</record>
<record id="reg_1_2" model="event.registration">
<field name="name">ASUStek</field>
<field name="email">info@asustek.com</field>
<field name="phone">+ 1 64 61 04 01</field>
<field name="partner_id" ref="base.res_partner_asus"/>
<field name="event_id" ref="event_1"/>
<field name="nb_register">10</field>
</record>
<record id="reg_0_1" model="event.registration">
<field name="name">Syleam</field>
<field name="email">contact@syleam.fr</field>
<field name="phone">+33 (0) 2 33 31 22 10</field>
<field name="partner_id" ref="base.res_partner_sednacom"/>
<field name="event_id" ref="event_0"/>
<field name="nb_register">6</field>
</record>
@ -77,6 +89,9 @@
<record id="reg_0_2" model="event.registration">
<field name="name">Camptocamp</field>
<field name="email">openerp@camptocamp.com</field>
<field name="phone">+41 21 619 10 04 </field>
<field name="event_id" ref="event_2"/>
<field name="partner_id" ref="base.res_partner_c2c"/>
<field name="nb_register">5</field>

3
addons/event/event_view.xml
View File

@ -286,7 +286,6 @@
<group col="6" colspan="4">
<field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
<field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
<field name="contact_id" attrs="{'readonly':[('state','!=', 'draft')]}" domain="[('partner_id','=',partner_id)]" on_change="onchange_contact_id(contact_id, context)"/>
<field name="nb_register"/>
<field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
<field name="origin"/>
@ -378,7 +377,7 @@
<separator orientation="vertical"/>
<field name="event_id" widget="selection"/>
<field name="name" string="Participant"
filter_domain="['|','|','|', ('name','ilike',self), ('contact_id','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
filter_domain="['|','|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
<field name="user_id" groups="base.group_extended">
<filter icon="terp-personal"
string="My Registrations"