Merge branch 'new_features' into new_features_mdb4

application/modules/Billapi/controllers/Import.php

@@ -25,7 +25,8 @@ class ImportController extends BillapiController {
 		$this->output->status = 1;
 		try {
 			$results = $this->action->execute();
-			foreach ($results as $result) {
+                        $imported_entities = isset($results['imported_entities']) ? $results['imported_entities'] : $results;
+			foreach ($imported_entities as $result) {
 				if($result !== true) {
 					$this->output->status = 2;
 					$this->output->warnings = [