X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Freferences.inc;h=671db9346e2a3b4267a71041ed958d798863a301;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=420e960e805d0169280c8d8dafd73dcd25656398;hpb=883307779f9ca5bac0533702a8702b0cccb4742f;p=fa-stable.git

diff --git a/includes/references.inc b/includes/references.inc
index 420e960e..671db934 100644
--- a/includes/references.inc
+++ b/includes/references.inc
@@ -37,7 +37,7 @@ class references
 		if ($reference != 'auto')
 			$this->save_last($reference, $type);
 	}
-	
+	// check if reference is used for any non voided transaction (used for ST_JOURNALENTRY type)
 	function exists($type, $reference) 
 	{
 		return (find_reference($type, $reference) != null);
@@ -53,6 +53,17 @@ class references
 	{
 		return get_next_reference($type);
 	}
+	//
+	//	Restore previous reference if voided trans ref was the last one.
+	//
+	function restore_last($type, $id) 
+	{
+		$reference = $this->get($type, $id);
+		$last = $this->increment($this->get_next($type), true); //decrement
+		if ($reference==$last) {
+			save_next_reference($type, $last);
+		}
+	}
 	
 	//------------------------------------
 
@@ -60,8 +71,10 @@ class references
 	{
 		return strlen(trim($reference)) > 0;
 	}
-	
-	function increment($reference) 
+	//
+	//	Increments (or decrements if $back==true) reference template
+	//
+	function increment($reference, $back=false) 
 	{
 		// New method done by Pete. So f.i. WA036 will increment to WA037 and so on.
        	// If $reference contains at least one group of digits,
@@ -74,14 +87,14 @@ class references
 			list($all, $prefix, $number, $postfix) = $result;
 			$dig_count = strlen($number); // How many digits? eg. 0003 = 4
 			$fmt = '%0' . $dig_count . 'd'; // Make a format string - leading zeroes
-			$nextval =  sprintf($fmt, intval($number + 1)); // Add one on, and put prefix back on
+			$val = intval($number + ($back ? ($number<1 ? 0 : -1) : 1));
+			$nextval =  sprintf($fmt, $val); // Add one on, and put prefix back on
 
 			return $prefix.$nextval.$postfix;
         }
         else 
             return $reference;
 	}
-	
 	//------------------------------------
 }