From 6fb96213625e565d86329a4cebc991b9599a71f5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 21 Jun 2017 21:11:27 +0300
Subject: [PATCH] Fix invoice number counter when mixing standard and recurring

---
 app/Models/Traits/GeneratesNumbers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()