fixed null project for advanced invoice calculator (#462)

2018-12-03 22:36:38 +01:00
parent 35305ad107
commit c58c12ea3d
5 changed files with 18 additions and 0 deletions
--- a/src/Invoice/Calculator/AbstractMergedCalculator.php
+++ b/src/Invoice/Calculator/AbstractMergedCalculator.php
@@ -44,6 +44,10 @@ abstract class AbstractMergedCalculator extends AbstractCalculator
            $timesheet->setActivity($entry->getActivity());
        }

+        if (null === $timesheet->getProject()) {
+            $timesheet->setProject($entry->getProject());
+        }
+
        if (empty($timesheet->getDescription())) {
            $timesheet->setDescription($entry->getActivity()->getName());
        }