mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 13:12:50 +01:00
Fix for merge
This commit is contained in:
parent
7a744680ae
commit
eb92f617b5
@ -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
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user