tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for merge

Browse source
This commit is contained in:
Hillel Coren 2017-01-23 22:14:07 +02:00
parent 7a744680ae
commit eb92f617b5
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Models/Invoice.php
View file

@ -643,7 +643,6 @@ class Invoice extends EntityModel implements BalanceAffecting
public function statusLabel()
{
return static::calcStatusLabel($this->invoice_status->name, $this->statusClass(), $this->getEntityType(), $this->quote_invoice_id);
>>>>>>> release-3.0.0
}
/**