diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php
index 75c8ef359..5a15785de 100644
--- a/application/libraries/Receiving_lib.php
+++ b/application/libraries/Receiving_lib.php
@@ -353,6 +353,7 @@ class Receiving_lib
 
     function clear_all()
     {
+        $this->set_invoice_number_enabled(FALSE);
         $this->clear_mode();
         $this->empty_cart();
         $this->delete_supplier();
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index a7e67c5a1..c6d03e391 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -535,6 +535,7 @@ class Sale_lib
 
 	function clear_all()
 	{
+		$this->set_invoice_number_enabled(FALSE);
 		$this->clear_mode();
 		$this->empty_cart();
 		$this->clear_comment();