[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Thu, 24 Mar 2011 08:35:17 +0000 (14:05 +0530)
committermtr <mtr@mtr>
Thu, 24 Mar 2011 08:35:17 +0000 (14:05 +0530)
commit3b6449f709fc5e8a6a55bd1908cebca7268e8f9c
tree11584fbdfdec2ab4042ea6235d1127e03a8250d3
parente80c3728f3ccdc84f08a1e1b4cd7b0233ea38afe
parent80e501b5817dd70735b67aa12a90d391b8c76e84
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110324083517-rg2u6e6nm12z7nd1
addons/hr_payroll/hr_payroll.py