jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

monthly budget, monthly report, unified report calculation (#2684)

Browse Source
This commit is contained in:
Kevin Papst
2021-08-06 18:38:41 +02:00
committed by GitHub
parent 21f785638c
commit cefd747e91
196 changed files with 5031 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/API/APIControllerBaseTest.php
View File

@@ -381,6 +381,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'budget' => 'float',
'timeBudget' => 'int',
'vatId' => '@string', // since 1.10
'budgetType' => '@string', // since 1.15
];
// if a project is embedded
@@ -436,6 +437,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'timeBudget' => 'int',
'orderNumber' => '@string',
'orderDate' => '@datetime',
'budgetType' => '@string', // since 1.15
];
// embedded activities
@@ -484,6 +486,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'budget' => 'float',
'timeBudget' => 'int',
'teams' => ['result' => 'array', 'type' => 'Team'],
'budgetType' => '@string', // since 1.15
];
case 'TimesheetEntity':