added hourly and money budgets to activity, project and customer (#843)

2019-06-11 13:18:57 +02:00
parent 833968a87d
commit 5702d7afa8
118 changed files with 1743 additions and 1077 deletions
--- a/tests/API/ActivityControllerTest.php
+++ b/tests/API/ActivityControllerTest.php
@@ -223,7 +223,7 @@ class ActivityControllerTest extends APIControllerBaseTest
        $expectedKeys = ['id', 'name', 'visible', 'project', 'hourlyRate', 'fixedRate', 'color'];

        if ($full) {
-            $expectedKeys = array_merge($expectedKeys, ['comment']);
+            $expectedKeys = array_merge($expectedKeys, ['comment', 'budget', 'timeBudget']);
        }

        $actual = array_keys($result);