[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
authormtr <mtr@mtr>
Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)
committermtr <mtr@mtr>
Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)
commit62ff4c00d61a57dc9181f333856549fded1c1932
treecd8147c40040a144c054fb3d6fc21514fefc1935
parent36366390b52ac97c45db40fdb7c9eaef4de1b2cd
parent00ef0b0c2e12593e7bc72f8a16ec93ac33f69760
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll

bzr revid: mtr@mtr-20110314063207-x6zetvo3b1if7nov
addons/hr/hr.py
addons/hr/hr_view.xml