Show both percentages (over total and subtotal)
Code clean
Merge pull request #288 from obiba/cptp-fixes

Cptp fixes