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

[IMP] removed contract tab in employee form view + fixed holidays shortcut 

bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45
This commit is contained in:
François Degrave 2010-12-29 17:10:29 +01:00
parent 3e1a8baf27
commit 469b5a8c6e
3 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr/security/ir.model.access.csv
View File

@ -8,3 +8,4 @@
"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
"access_ir_property_hr_user","ir_property hr_user","base.model_ir_property","base.group_hr_user",1,1,1,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
8 access_hr_job_user hr.job user model_hr_job base.group_hr_user 1 1 1 1
9 access_hr_res_partner_address res.partner.address base.model_res_partner_address base.group_hr_manager 1 1 1 1
10 access_hr_employee_marital_status_manager hr.employee.marital.status.manager model_hr_employee_marital_status base.group_hr_manager 1 1 1 1
11 access_ir_property_hr_user ir_property hr_user base.model_ir_property base.group_hr_user 1 1 1 0

2
addons/hr_holidays/hr_holidays_view.xml
View File

@ -438,7 +438,7 @@
context="{'search_default_employee_id': [active_id]}"
res_model="hr.holidays"
src_model="hr.employee"
view_id ="edit_holiday_new"
view_id ="view_holiday"
id="act_hr_employee_holiday_request"/>
</data>

59
addons/hr_payroll/hr_payroll_view.xml
View File

@ -32,9 +32,6 @@
<separator string="Description" colspan="2"/>
<field name="note" colspan="4" nolabel="1"/>
</page>
<page string="Contracts" groups="base.group_extended">
<field name="contracts_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
@ -109,63 +106,9 @@
<field name="medic_exam" select="1" string="Medical Examination"/>
</group>
</page>
<page string="Contracts" groups="base.group_extended">
<field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
<tree string="Contracts">
<field name="name"/>
<field name="job_id"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="working_hours"/>
<field name="wage_type_id"/>
<field name="wage"/>
</tree>
<form string="Contracts">
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="job_id"/>
<newline/>
<field name="wage"/>
<field name="wage_type_id" widget="selection"/>
<field name="type_id" widget="selection"/>
</group>
<notebook colspan="4">
<page string="Contract Details">
<group col="2" colspan="2">
<separator colspan="2" string="Duration"/>
<field name="date_start" select="1"/>
<field name="date_end" select="1"/>
<field name="working_hours"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<field name="struct_id" select="1"/>
<field name="advantages_gross"/>
<field name="advantages_net"/>
<field name="advantages" nolabel="1" colspan="2"/>
</group>
</page>
<page string="Work Permit">
<group col="2" colspan="2">
<separator colspan="2" string="Passport"/>
<field name="passport_id" domain="[('employee_id','=',parent.id)]"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Valid for"/>
<field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
<field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
<field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
</group>
</page>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
</notebook>
</form>
</field>
</page>
</xpath>
<xpath expr="/form/notebook/page[@string='Notes']" position="before">
<page string="Salary Structure" groups="base.group_extended">
<page string="Salary Structure" groups="base.group_hr_manager">
<group col="10" colspan="4">
<separator string="Salary Computation" colspan="10"/>
<field name="basic"/>