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

[MOD] hr: otherid,identification_id , hr_holidays: action added on list view 

bzr revid: vir@tinyerp.com-20100911132900-q5fxoeqr42m3tifb
This commit is contained in:
Vir (Open ERP) 2010-09-11 18:59:00 +05:30
parent 3362c2ea82
commit e5f3fd07e2
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/hr.py
View File

@ -110,7 +110,7 @@ class hr_employee(osv.osv):
'birthday': fields.date("Date of Birth"),
'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
'sinid': fields.char('SIN No', size=32, help="Social Insurance Number"),
'otherid': fields.char('Other ID', size=32),
'identification_id': fields.char('Identification No', size=32),
'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
'bank_account': fields.char('Bank Account', size=64),

4
addons/hr/hr_view.xml
View File

@ -39,7 +39,7 @@
<separator colspan="2" string="Social IDs"/>
<field name="ssnid"/>
<field name="sinid" groups="base.group_extended"/>
<field name="otherid" groups="base.group_extended"/>
<field name="identification_id" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator string="Status" colspan="2"/>
@ -83,7 +83,7 @@
<tree string="Employees">
<field name="name"/>
<field name="work_phone"/>
<field name="company_id"/>
<field name="company_id"/>
<field name="work_email" invisible="1"/>
<field name="department_id"/>
<field name="job_id"/>

5
addons/hr_holidays/hr_holidays_view.xml
View File

@ -231,6 +231,11 @@
<field name="user_id" invisible="1"/>
<field name="type"/>
<field name="state"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</tree>
</field>
</record>

6
addons/hr_payroll/hr_payroll.py
View File

@ -302,7 +302,7 @@ class payroll_register(osv.osv):
pline = {
'advice_id':pid,
'name':slip.employee_id.otherid,
'name':slip.employee_id.identification_id,
'employee_id':slip.employee_id.id,
'amount':slip.other_pay + slip.net,
'bysal':slip.net
@ -432,7 +432,7 @@ class payroll_advice_line(osv.osv):
sids = slip_pool.search(cr, uid, [('paid','=',False),('state','=','confirm'),('date','>=',dates[0]), ('employee_id','=',employee_id), ('date','<=',dates[1])], context=context)
if sids:
slip = slip_pool.browse(cr, uid, sids[0], context=context)
vals['name'] = slip.employee_id.otherid
vals['name'] = slip.employee_id.identification_id
vals['amount'] = slip.net + slip.other_pay
vals['bysal'] = slip.net
return {
@ -1314,7 +1314,7 @@ class hr_employee(osv.osv):
_description = 'Employee'
_columns = {
'pan_no':fields.char('PAN No', size=64, required=False, readonly=False),
# 'pan_no':fields.char('PAN No', size=64, required=False, readonly=False),
'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account"),
'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account"),
'pg_joining': fields.date('PF Join Date'),

4
addons/hr_payroll/hr_payroll_view.xml
View File

@ -97,7 +97,7 @@
<page string="Miscellaneous">
<group colspan="2" col="2">
<separator string="Personal Info" colspan="2"/>
<field name="pan_no" select="1"/>
<field name="otherid" select="1"/>
<field name="bank_account_id"/>
<field name="place_of_birth"/>
<field name="children"/>
@ -210,7 +210,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<field name="otherid" position="after">
<field name="identification_id" position="after">
<field name="passport_id"/>
</field>
</field>