Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 11:24:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

RFC: Vendor name in profit & loss report #2171

Browse Source
This commit is contained in:
Hillel Coren 2018-07-08 16:12:02 +03:00
parent b9b522bf6e
commit d90223cb3e
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Ninja/Reports/ClientReport.php
View File

@ -14,6 +14,8 @@ class ClientReport extends AbstractReport
'amount' => [], 'amount' => [],
'paid' => [], 'paid' => [],
'balance' => [], 'balance' => [],
'id_number' => ['columnSelector-false'],
'vat_number' => ['columnSelector-false'],
'public_notes' => ['columnSelector-false'], 'public_notes' => ['columnSelector-false'],
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
@ -70,6 +72,8 @@ class ClientReport extends AbstractReport
$account->formatMoney($amount, $client), $account->formatMoney($amount, $client),
$account->formatMoney($paid, $client), $account->formatMoney($paid, $client),
$account->formatMoney($amount - $paid, $client), $account->formatMoney($amount - $paid, $client),
$client->id_number,
$client->vat_number,
$client->public_notes, $client->public_notes,
$client->private_notes, $client->private_notes,
$client->user->getDisplayName(), $client->user->getDisplayName(),

2
app/Ninja/Reports/InvoiceReport.php
View File

@ -20,6 +20,7 @@ class InvoiceReport extends AbstractReport
'payment_date' => [], 'payment_date' => [],
'paid' => [], 'paid' => [],
'method' => [], 'method' => [],
'due_date' => ['columnSelector-false'],
'po_number' => ['columnSelector-false'], 'po_number' => ['columnSelector-false'],
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
@ -99,6 +100,7 @@ class InvoiceReport extends AbstractReport
$payment ? $payment->present()->payment_date : '', $payment ? $payment->present()->payment_date : '',
$payment ? $account->formatMoney($payment->getCompletedAmount(), $client) : '', $payment ? $account->formatMoney($payment->getCompletedAmount(), $client) : '',
$payment ? $payment->present()->method : '', $payment ? $payment->present()->method : '',
$invoice->present()->due_date,
$invoice->po_number, $invoice->po_number,
$invoice->private_notes, $invoice->private_notes,
$invoice->user->getDisplayName(), $invoice->user->getDisplayName(),

6
app/Ninja/Reports/ProfitAndLossReport.php
View File

@ -13,6 +13,7 @@ class ProfitAndLossReport extends AbstractReport
return [ return [
'type' => [], 'type' => [],
'client' => [], 'client' => [],
'vendor' => [],
'amount' => [], 'amount' => [],
'date' => [], 'date' => [],
'notes' => [], 'notes' => [],
@ -41,6 +42,7 @@ class ProfitAndLossReport extends AbstractReport
$this->data[] = [ $this->data[] = [
trans('texts.payment'), trans('texts.payment'),
$client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '', $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '',
'',
$account->formatMoney($payment->getCompletedAmount(), $client), $account->formatMoney($payment->getCompletedAmount(), $client),
$payment->present()->payment_date, $payment->present()->payment_date,
$payment->present()->method, $payment->present()->method,
@ -60,16 +62,18 @@ class ProfitAndLossReport extends AbstractReport
$expenses = Expense::scope() $expenses = Expense::scope()
->orderBy('expense_date', 'desc') ->orderBy('expense_date', 'desc')
->with('client.contacts') ->with('client.contacts', 'vendor')
->withArchived() ->withArchived()
->where('expense_date', '>=', $this->startDate) ->where('expense_date', '>=', $this->startDate)
->where('expense_date', '<=', $this->endDate); ->where('expense_date', '<=', $this->endDate);
foreach ($expenses->get() as $expense) { foreach ($expenses->get() as $expense) {
$client = $expense->client; $client = $expense->client;
$vendor = $expense->vendor;
$this->data[] = [ $this->data[] = [
trans('texts.expense'), trans('texts.expense'),
$client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '', $client ? ($this->isExport ? $client->getDisplayName() : $client->present()->link) : '',
$vendor ? ($this->isExport ? $vendor->name : $vendor->present()->link) : '',
'-' . $expense->present()->amount, '-' . $expense->present()->amount,
$expense->present()->expense_date, $expense->present()->expense_date,
$expense->present()->category, $expense->present()->category,