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

added invoice text field to project and activity (#3335)

Browse Source
This commit is contained in:
Kevin Papst
2022-05-31 17:49:23 +02:00
committed by GitHub
parent a93e78bd34
commit 88bf534573
13 changed files with 116 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Invoice/Calculator/ActivityInvoiceCalculator.php
View File

@@ -33,7 +33,11 @@ class ActivityInvoiceCalculator extends AbstractSumInvoiceCalculator implements
return;
}
$invoiceItem->setDescription($entry->getActivity()->getName());
if ($entry->getActivity()->getInvoiceText() !== null) {
$invoiceItem->setDescription($entry->getActivity()->getInvoiceText());
} else {
$invoiceItem->setDescription($entry->getActivity()->getName());
}
}
/**

7
src/Invoice/Calculator/ProjectInvoiceCalculator.php
View File

@@ -29,8 +29,11 @@ class ProjectInvoiceCalculator extends AbstractSumInvoiceCalculator implements C
protected function mergeSumInvoiceItem(InvoiceItem $invoiceItem, InvoiceItemInterface $entry)
{
$invoiceItem->setProject($entry->getProject());
$invoiceItem->setDescription($entry->getProject()->getName());
if ($entry->getProject()->getInvoiceText() !== null) {
$invoiceItem->setDescription($entry->getProject()->getInvoiceText());
} else {
$invoiceItem->setDescription($entry->getProject()->getName());
}
}
/**