Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix
authorantonylesuisse <antonylesuisse@users.noreply.github.com>
Mon, 7 Jul 2014 18:48:19 +0000 (20:48 +0200)
committerantonylesuisse <antonylesuisse@users.noreply.github.com>
Mon, 7 Jul 2014 18:48:19 +0000 (20:48 +0200)
commit6b274e4451f1ef06b12014ab4692cc1a5b6fcc80
tree2eef7b295a6ce42d1f36b68e6a2f63264f48893e
parentc0aa86b9ab46068553b0bc6117da715743d7851f
parent6c776d54068ccfb2282925f7b513ba1f5191fd99
Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix

skip the inactivate employee in leaves summary