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

invoice: do not use activity name as fallback for description (#4884)

Browse Source 
* added replacement field description_safe
This commit is contained in:
Kevin Papst
2024-06-03 19:01:40 +02:00
committed by GitHub
parent e29ef25581
commit 93ca983e0b
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$result = $entries[0];
$this->assertEquals('2018-11-28', $result->getBegin()?->format('Y-m-d'));
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals('', $result->getDescription());
$this->assertEquals(293.27, $result->getHourlyRate());
$this->assertNull($result->getFixedRate());
$this->assertEquals(472.5, $result->getRate());
@@ -190,7 +190,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription());
$this->assertNull($result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getFixedRate());
$this->assertEquals(488.38, $result->getRate());
@@ -266,7 +266,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription());
$this->assertNull($result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getRate());
$this->assertEquals(5800, $result->getDuration());