X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Freferences.inc;h=6487404b299546ff98f77cd89110b562b7042609;hb=59da28bb0029a57f2b786579d3b83435ac0bdc68;hp=6f3bd8916ec9b61e5357a2e4312896bbd62f30eb;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/includes/references.inc b/includes/references.inc
index 6f3bd891..6487404b 100644
--- a/includes/references.inc
+++ b/includes/references.inc
@@ -17,8 +17,8 @@ class references
 	function save($type, $id, $reference) 
 	{
 		add_reference($type, $id, $reference);
-		
-		references::save_last($reference, $type);
+		if ($reference != 'auto')
+			$this->save_last($reference, $type);
 	}
 	
 	function get($type, $id) 
@@ -31,6 +31,13 @@ class references
 		delete_reference($type, $id);
 	}	
 	
+	function update($type, $id, $reference) 
+	{
+	    update_reference($type, $id, $reference);
+		if ($reference != 'auto')
+			$this->save_last($reference, $type);
+	}
+	
 	function exists($type, $reference) 
 	{
 		return (find_reference($type, $reference) != null);
@@ -38,7 +45,7 @@ class references
 	
 	function save_last($reference, $type) 
 	{
-		$next = references::increment($reference);
+		$next = $this->increment($reference);
 		save_next_reference($type, $next);
 	}
 	
@@ -56,10 +63,20 @@ class references
 	
 	function increment($reference) 
 	{
-        if (is_numeric($reference))
-        	return $reference + 1;
+		// New method done by Pete. So f.i. WA036 will increment to WA037 and so on.
+       	// If $reference is trailed by digits, and digits only,
+        // extract them and add 1, then put the alpha prefix back on
+        // NB. preg_match returns 1 if the regex matches completely 
+        // also $result[0] holds entire string, 1 the first captured, 2 the 2nd etc.
+        if (preg_match('/^(.*?)(\d+)$/', $reference, $result) == 1) 
+        {
+            $dig_count = strlen($result[2]); // How many digits? eg. 0003 = 4
+            $fmt = '%0' . $dig_count . 'd'; // Make a format string - leading zeroes
+            $nextval =  $result[1] . sprintf($fmt, intval($result[2] + 1)); // Add one on, and put prefix back on
+            return $nextval;
+        }
         else 
-    		return $reference;
+            return $reference;
 	}
 	
 	//------------------------------------