[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 10 Oct 2012 07:26:53 +0000 (12:56 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 10 Oct 2012 07:26:53 +0000 (12:56 +0530)
commitf147dfe7cc82b7c39235916cce83cc19fb27381a
tree19b44ec4de5d5bb904e4fbb7a2586a9efab63606
parent14fdc7497ca9de58afeb4d9ecdfe7fcff33eeefb
parentf7d5b5ff0aabd129cbb9c9c1278eab0c3ec361f2
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121010072653-jy1rxxfdrm6cum7r
addons/hr/hr_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py