[MERGE] Merge with lp:openobject-addons
authorSbh (Openerp) <sbh@tinyerp.com>
Wed, 23 May 2012 06:38:32 +0000 (12:08 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Wed, 23 May 2012 06:38:32 +0000 (12:08 +0530)
commit2a6ff8b22e508f464223bbf652c48bc024b5a78c
treede707d1675cc3f8d52e2bc1ca44d1eb17f6eefda
parent135790bb6f6902899bfc717bbc921ebaf5b1f320
parent33d750f0ba4be2f138e408e9e1a694c9650f2d8b
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120523063832-qwevi2f4caymrczo
addons/hr/hr.py
addons/hr_holidays/hr_holidays.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_recruitment/report/hr_recruitment_report_view.xml