[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Thu, 31 Mar 2011 05:05:06 +0000 (10:35 +0530)
committermtr <mtr@mtr>
Thu, 31 Mar 2011 05:05:06 +0000 (10:35 +0530)
commit97a5a3c2273809a4cfcdbeabdce36cbcb11bd4f9
treef0fb8002097e46a5418f99a3452cf4b8b4e2ea7f
parent8663c434a4b602c7543cbebb1b565909e8d9fae5
parent4bf712c41320514248e8eb9dee6853bb8094be2b
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110331050506-yczfv6k3rq0027r5
addons/hr_payroll/hr_payroll.py
addons/hr_payroll/hr_payroll_view.xml