diff --git a/app/Models/Traits/GeneratesNumbers.php b/app/Models/Traits/GeneratesNumbers.php index 2c3bf6880363..ccdce951198a 100644 --- a/app/Models/Traits/GeneratesNumbers.php +++ b/app/Models/Traits/GeneratesNumbers.php @@ -282,7 +282,7 @@ trait GeneratesNumbers public function usesInvoiceCounter() { - return strpos($this->invoice_number_pattern, '{$counter}') !== false; + return ! $this->hasNumberPattern(ENTITY_INVOICE) || strpos($this->invoice_number_pattern, '{$counter}') !== false; } public function usesClientInvoiceCounter()