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

fixed short invoice (#891)

Browse Source
This commit is contained in:
Kevin Papst
2019-06-30 18:38:02 +02:00
committed by GitHub
parent 834a0a873f
commit 94d68c8b64
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Invoice/Calculator/ShortInvoiceCalculator.php
View File

@@ -34,6 +34,9 @@ class ShortInvoiceCalculator extends AbstractMergedCalculator implements Calcula
$this->mergeTimesheets($timesheet, $entry); $this->mergeTimesheets($timesheet, $entry);
} }
$timesheet->setFixedRate($timesheet->getRate());
$timesheet->setHourlyRate($timesheet->getRate());
return [$timesheet]; return [$timesheet];
} }

2
tests/Invoice/Calculator/ShortInvoiceCalculatorTest.php
View File

@@ -102,7 +102,9 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
/** @var Timesheet $result */ /** @var Timesheet $result */
$result = $sut->getEntries()[0]; $result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription()); $this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getRate()); $this->assertEquals(488.38, $result->getRate());
$this->assertEquals(488.38, $result->getFixedRate());
$this->assertEquals(5800, $result->getDuration()); $this->assertEquals(5800, $result->getDuration());
} }