Merge lp:~openerp-dev/openobject-addons/trunk-opw-582890-rgo into lp:openobject-addons
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-opw-582890-rgo |
Merge into: | lp:openobject-addons |
Diff against target: |
212 lines (+79/-9) 9 files modified
hr/hr.py (+19/-1) hr/hr_data.xml (+15/-0) hr/hr_view.xml (+37/-1) hr/security/ir.model.access.csv (+1/-0) hr_contract/test/test_hr_contract.yml (+1/-1) hr_payroll_account/test/hr_payroll_account.yml (+1/-1) l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml (+2/-2) l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml (+1/-1) l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml (+2/-2) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-opw-582890-rgo |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+140667@code.launchpad.net |
Description of the change
Hello,
This fix is against OPW Ref: 582890 where client faced a problem if he migrate from V6.0 to newer version where some of his data will be lost for "Marital Status" field of hr.employee object.
In V6.0, the marital status field is a m2o field, so user can create possible legal marital status as per the country rules.
In newer versions, this field changed to simple selection field with fixed values(Single, Married, Widower, Divorced), but there can be other legal marital status as per the country rules which a user expect in this list.
So, if customer want to migrate from V6.0 to V7.0, the status other than above four will be lost. hence, I changed the selection field to m2o field and made test cases adaptive to this change.
Kindly review the fix.
Thanks.
Unmerged revisions
- 8407. By Ravi Gohil (OpenERP)
-
[FIX] hr: added hr.employee.
marital. status object to be used as m2o in hr.employee to handle data lose in migrated from older version : (Maintenance Case : 582890)