diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 23abef23a3..d8cb8d1ddf 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -116,7 +116,8 @@ class MonthReportGenerator implements ReportGeneratorInterface /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); - $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation(); + $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end)->withAccountInformation() + ->withBudgetInformation()->withCategoryInformation()->withBillInformation(); $journals = $collector->getExtractedJournals(); $journals = array_reverse($journals, true); diff --git a/resources/views/v1/reports/partials/journals-audit.twig b/resources/views/v1/reports/partials/journals-audit.twig index dff077d4c4..88389d5e03 100644 --- a/resources/views/v1/reports/partials/journals-audit.twig +++ b/resources/views/v1/reports/partials/journals-audit.twig @@ -104,13 +104,19 @@ {{ journal.destination_account_name }} - {# TODO BUDGET #} + {% if journal.budget_id %} + {{ journal.budget_name }} + {% endif %} - {# TODO CATEGORY#} + {% if journal.category_id %} + {{ journal.category_name }} + {% endif %} - {#TODO BILL#} + {% if journal.bill_id %} + {{ journal.bill_name }} + {% endif %}