Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-582890-cbi into lp:openobject-addons/7.0

  1. 7.0-opw-582890-cbi
  2. Merge into 7.0
Proposed by Chris Biersbach (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-582890-cbi
Merge into: lp:openobject-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
hr/hr.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-582890-cbi
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+151750@code.launchpad.net

Description of the change

The inconvenient: In some countries, "cohabitant" is a marital status that has to be distinguished legally from other statuses (f.ex. Belgium)

The solution: I added "cohabitant" as a value in the selection field for hr_employees.

To post a comment you must log in.

Unmerged revisions

8798. By Chris Biersbach (OpenERP)

[IMP] HR: Adds a 'cohabitant' value to the marital selection field on employees

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr/hr.py'
2--- hr/hr.py 2012-12-24 12:29:19 +0000
3+++ hr/hr.py 2013-03-05 13:38:26 +0000
4@@ -166,7 +166,7 @@
5 'identification_id': fields.char('Identification No', size=32),
6 'otherid': fields.char('Other Id', size=64),
7 'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
8- 'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
9+ 'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced'), ('cohabitant', 'Cohabitant')], 'Marital Status'),
10 'department_id':fields.many2one('hr.department', 'Department'),
11 'address_id': fields.many2one('res.partner', 'Working Address'),
12 'address_home_id': fields.many2one('res.partner', 'Home Address'),