fixed null project for advanced invoice calculator (#462)
This commit is contained in:
@@ -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());
|
||||
}
|
||||
|
||||
@@ -176,6 +176,7 @@ trait RendererTrait
|
||||
'entry.date' => $this->getFormattedDateTime($begin),
|
||||
'entry.user_id' => $user->getId(),
|
||||
'entry.user_name' => $user->getUsername(),
|
||||
'entry.user_title' => $user->getTitle(),
|
||||
'entry.user_alias' => $user->getAlias(),
|
||||
'entry.activity' => $activity->getName(),
|
||||
'entry.activity_id' => $activity->getId(),
|
||||
|
||||
Reference in New Issue
Block a user