ReportCalculation1 grouping fixed
Merge branch 'master' of https://github.com/beliy26/PaMaNew.git