diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 475185aa10e..ea1f8f1b746 100755
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -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'),
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 907d2bdbb76..023d8a9115e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 52d66c7a514..22cfc9167ee 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -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 = {
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 97b63282f24..940f06250b4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -7,14 +7,13 @@
hr.contract.wage.type.period
form
-
-
hr.contract.wage.type.view.form
hr.contract.wage.type
@@ -74,39 +73,61 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,23 +151,32 @@
form
@@ -170,7 +200,7 @@
-
+
@@ -189,9 +219,7 @@
-
-
-
-
+
+