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

[Chris Biersbach (OpenERP)]

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.

Unmerged revisions

8798. By Chris Biersbach (OpenERP) on 2013-03-05

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

=== modified file 'hr/hr.py'
--- hr/hr.py	2012-12-24 12:29:19 +0000
+++ hr/hr.py	2013-03-05 13:38:26 +0000
@@ -166,7 +166,7 @@
         'identification_id': fields.char('Identification No', size=32),
         'otherid': fields.char('Other Id', size=64),
         'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
-        'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
+        'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced'), ('cohabitant', 'Cohabitant')], 'Marital Status'),
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner', 'Working Address'),
         'address_home_id': fields.many2one('res.partner', 'Home Address'),