*improved views
*chnged type of number_of_days into float and added a onchange *added a function field to compute the remaining number on an holiday_per_user bzr revid: qdp@tinyerp.com-20081120172119-bgkf38j3jxking5y
This commit is contained in:
qdp
parent
9139a84b8e
commit
66525c8761
|
|
@ -48,7 +48,6 @@ def strToDate(dt):
|
|||
|
||||
class hr_holidays_status(osv.osv):
|
||||
_name = "hr.holidays.status"
|
||||
# _inherit = 'hr.holidays.status'
|
||||
_description = "Holidays Status"
|
||||
_columns = {
|
||||
'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
|
||||
|
|
@ -65,22 +64,8 @@ hr_holidays_status()
|
|||
|
||||
class hr_holidays(osv.osv):
|
||||
_name = "hr.holidays"
|
||||
# _inherit = 'hr.holidays'
|
||||
_description = "Holidays"
|
||||
|
||||
def _get_days(self,cr, uid,ids, name, *args):
|
||||
res = {}
|
||||
for val in self.browse(cr, uid, ids):
|
||||
date_from = val.date_from
|
||||
date_to = val.date_to
|
||||
if date_from:
|
||||
if date_to:
|
||||
from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
|
||||
to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
|
||||
diff_day = (to_dt-from_dt)/(3600*24)
|
||||
res[val.id] = round(diff_day)+1
|
||||
return res
|
||||
|
||||
|
||||
_columns = {
|
||||
'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
|
||||
'state': fields.selection([('draft', 'draft'), ('confirm', 'Confirmed'), ('refuse', 'Refused'), ('validate', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
|
||||
|
|
@ -91,15 +76,33 @@ class hr_holidays(osv.osv):
|
|||
'user_id':fields.many2one('res.users', 'Employee_id', states={'draft':[('readonly',False)]}, select=True, readonly=True),
|
||||
'manager_id' : fields.many2one('hr.employee', 'Holiday manager', invisible=False, readonly=True),
|
||||
'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'number_of_days': fields.function(_get_days, method=True,store=True, type='float', string='Number of Days in this Holiday Request'),
|
||||
'number_of_days': fields.float('Number of Days in this Holiday Request',required=True),
|
||||
'case_id':fields.many2one('crm.case', 'Case'),
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
'employee_id' : _employee_get ,
|
||||
'state' : lambda *a: 'draft',
|
||||
'user_id': lambda obj, cr, uid, context: uid
|
||||
'user_id': lambda obj, cr, uid, context: uid,
|
||||
}
|
||||
_order = 'date_from desc'
|
||||
|
||||
def onchange_date_to(self, cr, uid, ids, date_from, date_to):
|
||||
result = {}
|
||||
if date_from:
|
||||
if date_to:
|
||||
from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
|
||||
to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
|
||||
diff_day = (to_dt-from_dt)/(3600*24)
|
||||
result['value'] = {
|
||||
'number_of_days': round(diff_day)+1
|
||||
}
|
||||
return result
|
||||
result['value'] = {
|
||||
'number_of_days': 0
|
||||
}
|
||||
return result
|
||||
|
||||
def set_to_draft(self, cr, uid, ids, *args):
|
||||
self.write(cr, uid, ids, {
|
||||
'state':'draft',
|
||||
|
|
@ -207,6 +210,13 @@ hr_holidays()
|
|||
class hr_holidays_per_user(osv.osv):
|
||||
_name = "hr.holidays.per.user"
|
||||
_description = "Holidays Per User"
|
||||
|
||||
def _get_remaining_leaves(self, cr, uid, ids, field_name, arg=None, context={}):
|
||||
result = {}
|
||||
for r in self.read(cr, uid, ids, ['max_leaves','leaves_taken']):
|
||||
result[r['id']] = r['max_leaves'] - r['leaves_taken']
|
||||
return result
|
||||
|
||||
_columns = {
|
||||
'employee_id' : fields.many2one('hr.employee', 'Employee',required=True),
|
||||
'user_id' : fields.many2one('res.users','User'),
|
||||
|
|
@ -215,12 +225,13 @@ class hr_holidays_per_user(osv.osv):
|
|||
'leaves_taken' : fields.float('Leaves Already Taken',readonly=True),
|
||||
'active' : fields.boolean('Active'),
|
||||
'notes' : fields.text('Notes'),
|
||||
'remaining_leaves': fields.function(_get_remaining_leaves, method=True, string='Remaining Leaves', type='float'),
|
||||
}
|
||||
_defaults = {
|
||||
'active' : lambda *a: True,
|
||||
}
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
|
||||
def create(self, cr, uid, vals, *args, **kwargs):
|
||||
if vals['employee_id']:
|
||||
obj_emp=self.pool.get('hr.employee').browse(cr,uid,vals['employee_id'])
|
||||
vals.update({'user_id': obj_emp.user_id.id})
|
||||
|
|
|
|||
|
|
@ -9,26 +9,27 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Employee holidays">
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<field name="date_from" select="1"/>
|
||||
<field name="date_to" select="1"/>
|
||||
<newline/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="holiday_status" select="1"/>
|
||||
<group col="12" colspan="2">
|
||||
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
|
||||
<button string="Validate" name="validate" states="confirm" type="workflow"/>
|
||||
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
|
||||
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
|
||||
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
|
||||
</group>
|
||||
<field name="state" select="1" colspan="2"/>
|
||||
<newline />
|
||||
<field name="notes" col="12" colspan="4"/>
|
||||
<newline />
|
||||
<field name="manager_id" colspan="2"/>
|
||||
<field name="employee_id" select="1" />
|
||||
<newline />
|
||||
<field name="number_of_days" colspan="2"/>
|
||||
<field name="date_from" select="1"/>
|
||||
<field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)"/>
|
||||
<notebook colspan="4">
|
||||
<page string="General">
|
||||
<field name="employee_id" select="1" />
|
||||
<field name="number_of_days"/>
|
||||
<field name="notes" col="12" colspan="4"/>
|
||||
<field name="manager_id"/>
|
||||
<newline/>
|
||||
<field name="state" select="1" colspan="2"/>
|
||||
<group colspan="2">
|
||||
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
|
||||
<button string="Validate" name="validate" states="confirm" type="workflow"/>
|
||||
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
|
||||
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
|
||||
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -102,11 +103,12 @@
|
|||
<field name="holiday_status" select="1" />
|
||||
<newline/>
|
||||
<field name="max_leaves" select="2" colspan="2" />
|
||||
<newline/>
|
||||
<field name="leaves_taken" select="2" colspan="2" />
|
||||
<newline/>
|
||||
<field name="remaining_leaves" select="2" colspan="2" />
|
||||
<field name="active" select="2"/>
|
||||
<newline/>
|
||||
<field name="notes" colspan="4" />
|
||||
<field name="notes" colspan="4" select="2"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -119,7 +121,7 @@
|
|||
<field name="employee_id"/>
|
||||
<field name="holiday_status"/>
|
||||
<field name="max_leaves"/>
|
||||
<field name="leaves_taken"/>
|
||||
<field name="remaining_leaves"/>
|
||||
<field name="active" select="2"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
|
|
|||
Loading…
Reference in New Issue