lp:~openerp-dev/openobject-addons/trunk-opw-582890-rgo

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2012-12-19

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8407. By Ravi Gohil (OpenERP) on 2012-12-19

[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)

8406. By Antony Lesuisse (OpenERP) on 2012-12-19

[IMP] auth_crypt add sha256 from enhance_base_crypt_trunk (not enabled by default)

8405. By Antony Lesuisse (OpenERP) on 2012-12-19

[IMP] auth_crypt base_crypt cleanup

8404. By Raphael Collet (OpenERP) on 2012-12-19

[IMP] project_issue: make extra info visible to project managers

8403. By Raphael Collet (OpenERP) on 2012-12-19

[FIX] hr_holidays: workflow transition was missing signal for first validation

8402. By Launchpad Translations on behalf of openerp on 2012-12-19

Launchpad automatic translations update.

8401. By Antony Lesuisse (OpenERP) on 2012-12-19

[IMP] base_crypt rename the confusing encrypt_md5 into md5crypt

8400. By Olivier Dony (Odoo) on 2012-12-19

[MERGE] sale_margin: functions passed to store triggers cannot use inheritance, courtesy of Serpent Consulting Services

8399. By Olivier Dony (Odoo) on 2012-12-19

[MERGE] fleet: purchaser_id should is a res.partner id, courtesy of Serpent Consulting Services

8398. By Olivier Dony (Odoo) on 2012-12-19

[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)

ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary