[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Wed, 30 Mar 2011 05:19:41 +0000 (10:49 +0530)
committermtr <mtr@mtr>
Wed, 30 Mar 2011 05:19:41 +0000 (10:49 +0530)
commit2d7687ab6ec8e94dcfe3a2ce3c2ffbd8fcfaa779
treed812834bf927ef2bb13bec6de5141b1852d587c9
parentfa0ca7a4ae6be65563fe6d84c481056ced4ef992
parentbc6a98c3ab60f6afe6e5bb5bd5650d1d72b0cb87
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110330051941-06s0i1nqfri8cv1r
addons/hr_payroll/hr_payroll.py