[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 7 Mar 2011 11:37:03 +0000 (17:07 +0530)
committermtr <mtr@mtr>
Mon, 7 Mar 2011 11:37:03 +0000 (17:07 +0530)
commit7b7a1915f4a3d8139e1b174ed458345f000279b0
treeef02c8a32530545eb0123de6761ccec33204866f
parent6e6b21a87585a932d9641e0c19f977b8d2d995be
parente35ce1fdcdce5f44d088a61e30690364202b7e7c
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
addons/hr_payroll/hr_payroll.py
addons/hr_payroll/hr_payroll_view.xml