pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]event: remove date and add duration

Browse Source 
bzr revid: kjo@tinyerp.com-20120704111529-8nm276wyabrcn1wd
This commit is contained in:
Kuldeep Joshi (OpenERP)
2012-07-04 16:45:29 +05:30
parent 57329cc833
commit 36dca91195
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/event.py
+12 -5
View File
@@ -23,6 +23,7 @@ import time
from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
from datetime import datetime, timedelta
class event_type(osv.osv):
""" Event Type """
@@ -336,8 +337,9 @@ class event_registration(osv.osv):
# Fields for address, due to separation from event.registration and res.partner
'email': fields.char('Email', size=240),
'phone': fields.char('Phone', size=64),
'name': fields.char('Name', size=128, required=True, select=True),
'name': fields.char('Name', size=128, select=True),
'active': fields.boolean('Active'),
'duration': fields.float('Duration'),
}
_defaults = {
@@ -347,7 +349,6 @@ class event_registration(osv.osv):
}
_order = 'name, create_date desc'
def do_draft(self, cr, uid, ids, context=None):
self.do_draft_send_note(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -432,17 +433,23 @@ class event_registration(osv.osv):
def onchange_event(self, cr, uid, ids, event_id, context=None):
"""This function returns value of Product Name, Unit Price based on Event.
"""
value= {}
if context is None:
context = {}
if not event_id:
return {}
event_obj = self.pool.get('event.event')
data_event = event_obj.browse(cr, uid, event_id, context=context)
return {'value':
{'event_begin_date': data_event.date_begin,
start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
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,
'event_end_date': data_event.date_end,
'company_id': data_event.company_id and data_event.company_id.id or False,
}
'duration': value['duration'],
}
}
def onchange_partner_id(self, cr, uid, ids, part, context=None):
addons/event/event_view.xml
+3 -11
View File
@@ -386,18 +386,10 @@
<label for="event_id" class="oe_edit_only"/>
<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_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
<field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
<label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
<field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
<label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
<label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
<field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
<label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
</h1>
<group colspan="2" col="2">
<h2>
<field name="nb_register" class="oe_inline"/> Participants
</h2>
</group>
<group colspan="4" col="4">
<group colspan="2">
<field name="name" invisible="1"/>