Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add po number as optional report field

Browse Source
This commit is contained in:
Hillel Coren 2018-02-13 21:55:33 +02:00
parent 2326ddfd3b
commit 09c1c4869e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/Vendor.php
View File

@ -214,7 +214,6 @@ class Vendor extends EntityModel
*/ */
public function addVendorContact($data, $isPrimary = false) public function addVendorContact($data, $isPrimary = false)
{ {
//$publicId = isset($data['public_id']) ? $data['public_id'] : false;
$publicId = isset($data['public_id']) ? $data['public_id'] : (isset($data['id']) ? $data['id'] : false); $publicId = isset($data['public_id']) ? $data['public_id'] : (isset($data['id']) ? $data['id'] : false);
if ($publicId && $publicId != '-1') { if ($publicId && $publicId != '-1') {

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

@ -20,6 +20,7 @@ class InvoiceReport extends AbstractReport
'payment_date' => [], 'payment_date' => [],
'paid' => [], 'paid' => [],
'method' => [], 'method' => [],
'po_number' => ['columnSelector-false'],
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
]; ];
@ -93,6 +94,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->po_number,
$invoice->private_notes, $invoice->private_notes,
$invoice->user->getDisplayName(), $invoice->user->getDisplayName(),
]; ];