[IMP]event: add duration field
bzr revid: kjo@tinyerp.com-20120705065712-ivluxs98wd1kjyza
This commit is contained in:
Kuldeep Joshi (OpenERP)
parent
36dca91195
commit
4d14b9378a
|
|
@ -51,7 +51,7 @@ Note that:
|
|||
'res_partner_view.xml',
|
||||
'email_template.xml',
|
||||
],
|
||||
'demo_xml': ['event_demo.xml'],
|
||||
'demo_xml': ['event_demo.yml'],
|
||||
'test': ['test/process/event_draft2done.yml'],
|
||||
'css': ['static/src/css/event.css'],
|
||||
'installable': True,
|
||||
|
|
|
|||
|
|
@ -424,7 +424,6 @@ class event_registration(osv.osv):
|
|||
contact_id = addr_obj.browse(cr, uid, contact, context=context)
|
||||
data = {
|
||||
'email':contact_id.email,
|
||||
'contact_id':contact_id.id,
|
||||
'name':contact_id.name,
|
||||
'phone':contact_id.phone,
|
||||
}
|
||||
|
|
@ -444,13 +443,12 @@ class event_registration(osv.osv):
|
|||
end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
|
||||
diff = end - start
|
||||
duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
|
||||
value['duration'] = round(duration, 2)
|
||||
return {'value': {'event_begin_date': data_event.date_begin,
|
||||
value ['value']= {'event_begin_date': data_event.date_begin,
|
||||
'event_end_date': data_event.date_end,
|
||||
'company_id': data_event.company_id and data_event.company_id.id or False,
|
||||
'duration': value['duration'],
|
||||
}
|
||||
'duration': round(duration, 2),
|
||||
}
|
||||
return value
|
||||
|
||||
def onchange_partner_id(self, cr, uid, ids, part, context=None):
|
||||
res_obj = self.pool.get('res.partner')
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- Demo Data for Event Type -->
|
||||
<record id="event_type_0" model="event.type">
|
||||
<field name="name">Seminar</field>
|
||||
</record>
|
||||
|
||||
<record id="event_type_1" model="event.type">
|
||||
<field name="name">Exhibition</field>
|
||||
</record>
|
||||
|
||||
<record id="event_type_2" model="event.type">
|
||||
<field name="name">Conference</field>
|
||||
</record>
|
||||
|
||||
<record id="event_type_3" model="event.type">
|
||||
<field name="name">Show</field>
|
||||
</record>
|
||||
|
||||
<record id="event_type_4" model="event.type">
|
||||
<field name="name">Training</field>
|
||||
</record>
|
||||
|
||||
<!-- Demo data for Event -->
|
||||
<record id="event_0" model="event.event">
|
||||
<field name="name">Concert of Bon Jovi</field>
|
||||
<field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
|
||||
<field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
|
||||
<field name="register_max">500</field>
|
||||
<field name="type" ref="event_type_1"/>
|
||||
</record>
|
||||
|
||||
<record id="event_1" model="event.event">
|
||||
<field name="name">Opera of Verdi</field>
|
||||
<field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
|
||||
<field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
|
||||
<field name="type" ref="event_type_1"/>
|
||||
<field name="register_min">50</field>
|
||||
<field name="register_max">350</field>
|
||||
</record>
|
||||
<record id="event_2" model="event.event">
|
||||
<field name="name">Conference on ERP Business</field>
|
||||
<field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
|
||||
<field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
|
||||
<field name="type" ref="event_type_2"/>
|
||||
<field name="register_max">200</field>
|
||||
</record>
|
||||
<function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
|
||||
<function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
-
|
||||
from datetime import datetime, timedelta
|
||||
-
|
||||
!record {model: event.type, id: event_type_0}:
|
||||
name: 'Seminar'
|
||||
-
|
||||
!record {model: event.type, id: event_type_1}:
|
||||
name: 'Exhibition'
|
||||
-
|
||||
!record {model: event.type, id: event_type_2}:
|
||||
name: 'Conference'
|
||||
-
|
||||
!record {model: event.type, id: event_type_3}:
|
||||
name: 'Show'
|
||||
-
|
||||
!record {model: event.type, id: event_type_4}:
|
||||
name: 'Training'
|
||||
-
|
||||
!record {model: event.event, id: event_0}:
|
||||
name: 'Concert of Bon Jovi'
|
||||
date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
|
||||
date_end: !eval time.strftime('%Y-%m-01 23:05:15')
|
||||
register_max: 500
|
||||
type: event_type_1
|
||||
-
|
||||
!record {model: event.event, id: event_1}:
|
||||
name: 'Opera of Verdi'
|
||||
date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
|
||||
date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
|
||||
register_min: 50
|
||||
register_max: 350
|
||||
type: event_type_1
|
||||
-
|
||||
!record {model: event.event, id: event_2}:
|
||||
name: 'Conference on ERP Business'
|
||||
date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
|
||||
date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
|
||||
register_min: 50
|
||||
register_max: 350
|
||||
type: event_type_2
|
||||
-
|
||||
!record {model: event.registration, id: reg_1_1}:
|
||||
name: 'Agrolait'
|
||||
email: 's.l@agrolait.be'
|
||||
phone: '003281588558'
|
||||
event_id: event_1
|
||||
partner_id: base.res_partner_asus
|
||||
nb_register: 5
|
||||
-
|
||||
!record {model: event.registration, id: reg_1_2}:
|
||||
name: 'ASUStek'
|
||||
email: 'info@asustek.com'
|
||||
phone: '+ 1 64 61 04 01'
|
||||
event_id: event_1
|
||||
partner_id: base.res_partner_asus
|
||||
nb_register: 10
|
||||
-
|
||||
!record {model: event.registration, id: reg_0_1}:
|
||||
name: 'Syleam'
|
||||
email: 'contact@syleam.fr'
|
||||
phone: '+33 (0) 2 33 31 22 10'
|
||||
event_id: event_0
|
||||
partner_id: base.res_partner_sednacom
|
||||
nb_register: 6
|
||||
-
|
||||
!record {model: event.registration, id: reg_0_2}:
|
||||
name: 'Camptocamp'
|
||||
email: 'openerp@camptocamp.com'
|
||||
phone: '+41 21 619 10 04'
|
||||
event_id: event_2
|
||||
partner_id: base.res_partner_c2c
|
||||
nb_register: 5
|
||||
|
||||
|
|
@ -387,7 +387,7 @@
|
|||
<h1>
|
||||
<field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
|
||||
<label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
|
||||
<field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
|
||||
<field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
|
||||
<label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
|
||||
</h1>
|
||||
<group colspan="4" col="4">
|
||||
|
|
|
|||
Loading…
Reference in New Issue