[IMP] hr_contract: changed passport into char field and removed useless object
bzr revid: qdp-launchpad@openerp.com-20110711170401-q71lycboq23izgnv
This commit is contained in:
Quentin (OpenERP)
parent
5ec533eb67
commit
8d29e89f44
|
|
@ -51,29 +51,6 @@ class hr_employee(osv.osv):
|
|||
|
||||
hr_employee()
|
||||
|
||||
class hr_passport(osv.osv):
|
||||
"""
|
||||
Employee Passport
|
||||
Passport based Contracts for Employees
|
||||
"""
|
||||
|
||||
_name = 'hr.passport'
|
||||
_description = 'Passport Detail'
|
||||
_columns = {
|
||||
'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
|
||||
'name': fields.char('Passport No', size=64, required=True, readonly=False),
|
||||
'country_id': fields.many2one('res.country', 'Country of Issue', required=True),
|
||||
'address_id': fields.many2one('res.partner.address', 'Address', required=False),
|
||||
'date_issue': fields.date('Passport Issue Date', required=True),
|
||||
'date_expire': fields.date('Passport Expire Date', required=True),
|
||||
'note': fields.text('Description'),
|
||||
'contracts_ids': fields.one2many('hr.contract', 'passport_id', 'Contracts', required=False, readonly=True),
|
||||
}
|
||||
_sql_constraints = [
|
||||
('passport_no_uniq', 'unique (employee_id, name)', 'The Passport No must be unique !'),
|
||||
]
|
||||
hr_passport()
|
||||
|
||||
class hr_contract_type(osv.osv):
|
||||
_name = 'hr.contract.type'
|
||||
_description = 'Contract Type'
|
||||
|
|
@ -100,7 +77,7 @@ class hr_contract(osv.osv):
|
|||
'advantages': fields.text('Advantages'),
|
||||
'notes': fields.text('Notes'),
|
||||
'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False),
|
||||
'passport_id': fields.many2one('hr.passport', 'Passport', required=False),
|
||||
'passport': fields.char('Passport', required=False),
|
||||
'visa_no': fields.char('Visa No', size=64, required=False, readonly=False),
|
||||
'visa_expire': fields.date('Visa Expire Date'),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,82 +2,6 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- Passport Views -->
|
||||
<record id="hr_passport_form" model="ir.ui.view">
|
||||
<field name="name">hr.passport.form</field>
|
||||
<field name="model">hr.passport</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Passport">
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1" colspan="4"/>
|
||||
<field name="employee_id" />
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator string="Country & Address" colspan="4"/>
|
||||
<field name="country_id" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator string="Valid From" colspan="2"/>
|
||||
<field name="date_issue" select="1"/>
|
||||
<field name="date_expire" select="1"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Description">
|
||||
<separator string="Description" colspan="2"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="hr_passport_tree" model="ir.ui.view">
|
||||
<field name="name">hr.passport.tree</field>
|
||||
<field name="model">hr.passport</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Passport">
|
||||
<field name="name" />
|
||||
<field name="employee_id" />
|
||||
<field name="address_id"/>
|
||||
<field name="country_id" />
|
||||
<field name="date_expire"/>
|
||||
<field name="date_issue" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_hr_passport_filter" model="ir.ui.view">
|
||||
<field name="name">hr.passport.select</field>
|
||||
<field name="model">hr.passport</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Passport">
|
||||
<group col="8" colspan="4">
|
||||
<field name="name"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="country_id"/>
|
||||
<field name="address_id"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group col="8" colspan="4" expand="0" string="Group By...">
|
||||
<filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
|
||||
<filter string="Country" name="country_id" icon="terp-go-home" context="{'group_by':'country_id'}"/>
|
||||
<filter string="Expire" name="date_expire" icon="terp-go-month" context="{'group_by':'date_expire'}"/>
|
||||
<filter string="Issue" name="date_issue" icon="terp-go-month" context="{'group_by':'date_issue'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
<record id="action_hr_passport_tree" model="ir.actions.act_window">
|
||||
<field name="name">All Passports</field>
|
||||
<field name="res_model">hr.passport</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="hr_passport_tree"/>
|
||||
<field name="search_view_id" ref="view_hr_passport_filter"/>
|
||||
</record>
|
||||
<!-- End Passport Views -->
|
||||
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
|
||||
<record id="hr_hr_employee_view_form2" model="ir.ui.view">
|
||||
<field name="name">hr.hr.employee.view.form2</field>
|
||||
|
|
@ -171,7 +95,7 @@
|
|||
<page string="Work Permit">
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Passport"/>
|
||||
<field name="passport_id" domain="[('employee_id','=',employee_id)]"/>
|
||||
<field name="passport">
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="2" string="Valid for"/>
|
||||
|
|
|
|||
|
|
@ -3,5 +3,3 @@
|
|||
"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
|
||||
"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_passport_manager","hr.passport.manager","model_hr_passport","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_passport","hr.passport","model_hr_passport","base.group_hr_user",1,1,1,1
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue