Merge branch 'master' into feature/added-support-for-reportAverageSpending

# Conflicts:
#	Mplusqapiclient.php

Author: freerk-mpluskassa

Mplusqapiclient.php

@@ -9328,7 +9328,7 @@ public function convertReportRequest($method, $arguments) {
                     'fromFinancialDate', 'throughFinancialDate',
                 ),
                 'optional' => array(
-                    'branchNumbers', 'turnoverGroups', 'perHour',
+                    'branchNumbers', 'turnoverGroups', 'perHour', 'turnoverGroupTypes',
                 ),
             ),
             'reportTurnoverByBranch' => array(
@@ -9450,6 +9450,12 @@ public function convertReportRequest($method, $arguments) {
                                 }
                                 $request['turnoverGroupFilter'] = $arguments[$callField];
                                 break;
+                            case "turnoverGroupTypes":
+                                if (!is_array($arguments[$callField])) {
+                                    $arguments[$callField] = array($arguments[$callField]);
+                                }
+                                $request['turnoverGroupTypeFilter'] = $arguments[$callField];
+                                break;
                             case "employeeNumbers":
                                 if (!is_array($arguments[$callField])) {
                                     $arguments[$callField] = array($arguments[$callField]);