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

added global activities (#259)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-06 23:10:34 +01:00
committed by GitHub
parent c66dfbc653
commit db7de3aac1
70 changed files with 1168 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Timesheet/Calculator/RateCalculator.php
View File

@@ -74,7 +74,7 @@ class RateCalculator implements CalculatorInterface
return $activity->getHourlyRate();
}
$project = $activity->getProject();
$project = $record->getProject();
if (null !== $project) {
if (null !== $project->getHourlyRate()) {
return $project->getHourlyRate();
@@ -104,7 +104,7 @@ class RateCalculator implements CalculatorInterface
return $activity->getFixedRate();
}
$project = $activity->getProject();
$project = $record->getProject();
if (null !== $project) {
if (null !== $project->getFixedRate()) {
return $project->getFixedRate();