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

post release 1.2 fixes (#1068)

Browse Source 
* fix release command
* fix permission name in UPGRADING
* added missing korean calendar translations
* fixed entry.total for invoice with fixed rates
This commit is contained in:
Kevin Papst
2019-09-03 11:59:34 +02:00
committed by GitHub
parent 94f8159fdc
commit 93ab3d5666
13 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Invoice/InvoiceItem.php
View File

@@ -64,7 +64,7 @@ class InvoiceItem
*/
private $additionalFields = [];
public function addAdditionalField(string $name, string $value): InvoiceItem
public function addAdditionalField(string $name, ?string $value): InvoiceItem
{
$this->additionalFields[$name] = $value;

3
src/Invoice/Renderer/RendererTrait.php
View File

@@ -183,8 +183,7 @@ trait RendererTrait
$amount = $this->getFormattedDuration($invoiceItem->getDuration());
$description = $invoiceItem->getDescription();
if (null !== $invoiceItem->getFixedRate()) {
$rate = $invoiceItem->getFixedRate();
if ($invoiceItem->isFixedRate()) {
$hourlyRate = $invoiceItem->getFixedRate();
$amount = $invoiceItem->getAmount();
}