[IMP] hr module improvement, better views
bzr revid: fp@tinyerp.com-20100305173619-bil2o952ca21ifk8
This commit is contained in:
Fabien Pinckaers
parent
c3148c753e
commit
757618c604
|
|
@ -98,9 +98,9 @@ class hr_employee(osv.osv):
|
|||
'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
|
||||
'sinid': fields.char('SIN No', size=32),
|
||||
'otherid': fields.char('Other ID', size=32),
|
||||
'gender': fields.selection([('',''),('male','Male'),('female','Female')], 'Gender'),
|
||||
'gender': fields.selection([('male','Male'),('female','Female')], 'Gender'),
|
||||
'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
|
||||
|
||||
'bank_account': fields.char('Bank Account', size=56),
|
||||
'partner_id' : fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
|
||||
|
||||
'address_id': fields.many2one('res.partner.address', 'Working Address'),
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Social IDs"/>
|
||||
<field name="ssnid"/>
|
||||
<field name="sinid"/>
|
||||
<field name="sinid" groups="base.group_extended"/>
|
||||
<field name="otherid"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
|
|
|
|||
|
|
@ -29,10 +29,11 @@ class hr_employee(osv.osv):
|
|||
_inherit = "hr.employee"
|
||||
_columns = {
|
||||
'manager' : fields.boolean('Manager'),
|
||||
'medic_exam' : fields.date('Medical examination date'),
|
||||
'audiens_num' : fields.char('AUDIENS Number', size=30),
|
||||
'medic_exam' : fields.date('Medical Examination Date'),
|
||||
'place_of_birth' : fields.char('Place of Birth', size=30),
|
||||
'children' : fields.integer('Number of children'),
|
||||
'children' : fields.integer('Number of Children'),
|
||||
'vehicle' : fields.integer('Company Vehicle'),
|
||||
'vehicle_distance' : fields.integer('Home-Work Distance', help="In kilometers"),
|
||||
'contract_ids' : fields.one2many('hr.contract', 'employee_id', 'Contracts'),
|
||||
}
|
||||
hr_employee()
|
||||
|
|
@ -66,18 +67,31 @@ class hr_contract_wage_type(osv.osv):
|
|||
}
|
||||
hr_contract_wage_type()
|
||||
|
||||
|
||||
class hr_contract_type(osv.osv):
|
||||
_name = 'hr.contract.type'
|
||||
_description = 'Contract Type'
|
||||
_columns = {
|
||||
'name' : fields.char('Contract Type', size=30, required=True),
|
||||
}
|
||||
hr_contract_type()
|
||||
|
||||
class hr_contract(osv.osv):
|
||||
_name = 'hr.contract'
|
||||
_description = 'Contract'
|
||||
_columns = {
|
||||
'name' : fields.char('Contract Name', size=30, required=True),
|
||||
'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True),
|
||||
'function' : fields.many2one('res.partner.function', 'Function'),
|
||||
'name' : fields.char('Contract Reference', size=30, required=True),
|
||||
'employee_id' : fields.many2one('hr.employee', "Employee", required=True),
|
||||
'type_id' : fields.many2one('hr.contract.type', "Contract Type"),
|
||||
'job_id' : fields.many2one('hr.job', 'Job Title'),
|
||||
'date_start' : fields.date('Start Date', required=True),
|
||||
'date_end' : fields.date('End Date'),
|
||||
'working_hours_per_day_id' : fields.many2one('resource.calendar','Working hours per day'),
|
||||
'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
|
||||
'wage' : fields.float('Wage', required=True),
|
||||
'wage' : fields.float('Wage', digits=(16,2), required=True),
|
||||
'advantages': fields.text('Advantages'),
|
||||
'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
|
||||
'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
|
||||
'notes' : fields.text('Notes'),
|
||||
}
|
||||
_defaults = {
|
||||
|
|
|
|||
|
|
@ -7,14 +7,13 @@
|
|||
<field name="model">hr.contract.wage.type.period</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Wage period">
|
||||
<form string="Wage Period">
|
||||
<field colspan="4" name="name"/>
|
||||
<field name="factor_days"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="hr_contract_wage_type_view_form" model="ir.ui.view">
|
||||
<field name="name">hr.contract.wage.type.view.form</field>
|
||||
<field name="model">hr.contract.wage.type</field>
|
||||
|
|
@ -74,39 +73,61 @@
|
|||
<field colspan="4" name="contract_ids" nolabel="1">
|
||||
<tree string="Contracts">
|
||||
<field name="name"/>
|
||||
<field name="function"/>
|
||||
<field name="job_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="working_hours_per_day_id"/>
|
||||
<field name="wage_type_id"/>
|
||||
<field name="wage"/>
|
||||
</tree>
|
||||
|
||||
<form string="Contract">
|
||||
<separator colspan="4" string="Generalities"/>
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<newline/>
|
||||
<separator colspan="4" string="Contract Duration"/>
|
||||
<field name="function"/>
|
||||
<field name="working_hours_per_day_id"/>
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_end" select="1"/>
|
||||
|
||||
<separator colspan="4" string="Salary"/>
|
||||
<field name="wage_type_id"/>
|
||||
<field name="wage"/>
|
||||
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
<group colspan="3" 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>
|
||||
<page string="Main Data">
|
||||
<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_per_day_id"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Advantages"/>
|
||||
<field name="advantages_net"/>
|
||||
<field name="advantages_gross"/>
|
||||
<field name="advantages" nolabel="1" colspan="2"/>
|
||||
</group>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Miscelleanous">
|
||||
<field name="manager" select="1"/>
|
||||
<field name="medic_exam" select="1"/>
|
||||
<field name="audiens_num"/>
|
||||
<field name="place_of_birth"/>
|
||||
<field name="children"/>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Personal Info" colspan="2"/>
|
||||
<field name="bank_account"/>
|
||||
<field name="place_of_birth"/>
|
||||
<field name="children"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Job Info" colspan="2"/>
|
||||
<field name="manager" select="1"/>
|
||||
<field name="vehicle" select="1"/>
|
||||
<field name="vehicle_distance" select="1"/>
|
||||
<field name="medic_exam" select="1"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Others Info" colspan="2"/>
|
||||
<field name="medic_exam" select="1"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
|
|
@ -130,23 +151,32 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Contract">
|
||||
<separator colspan="4" string="Generalities"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="employee_id" select="1"/>
|
||||
<field name="function"/>
|
||||
<newline/>
|
||||
|
||||
<separator colspan="4" string="Contract Duration"/>
|
||||
<field name="date_start" select="1"/>
|
||||
<field name="date_end" select="1"/>
|
||||
<field name="working_hours_per_day_id"/>
|
||||
<newline/>
|
||||
|
||||
<separator colspan="4" string="Remuneration"/>
|
||||
<field name="wage_type_id"/>
|
||||
<field name="wage"/>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
<group colspan="3" col="6">
|
||||
<field name="name" select="1"/>
|
||||
<field name="employee_id" select="1"/>
|
||||
<field name="job_id"/>
|
||||
<field name="wage"/>
|
||||
<field name="wage_type_id" widget="selection"/>
|
||||
<field name="type_id" widget="selection"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Main Data">
|
||||
<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_per_day_id"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Advantages"/>
|
||||
<field name="advantages_net"/>
|
||||
<field name="advantages_gross"/>
|
||||
<field name="advantages" nolabel="1" colspan="2"/>
|
||||
</group>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -170,7 +200,7 @@
|
|||
<tree string="Contracts">
|
||||
<field name="name"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="function"/>
|
||||
<field name="job_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="working_hours_per_day_id"/>
|
||||
|
|
@ -189,9 +219,7 @@
|
|||
</record>
|
||||
|
||||
|
||||
<!-- <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_human_resources"/>-->
|
||||
<!-- <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>-->
|
||||
<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
|
||||
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
|
||||
<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
|
||||
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue