X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsystypes.inc;h=c1c17a4a6f3e95b15b5e7f2fa3270bdafbb7d21e;hb=1b9351ae81a67726e757eba55895a4f059c7f128;hp=9f93fd541aeb4afbc38c05c0a0f782a6cb2ac452;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/includes/systypes.inc b/includes/systypes.inc
index 9f93fd54..c1c17a4a 100644
--- a/includes/systypes.inc
+++ b/includes/systypes.inc
@@ -9,26 +9,33 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-Function get_next_trans_no ($trans_type){
 
-    // sql to get the next display transaction number
-	//these are maintained in the table sys_types
-    // Also updates the transaction number
+//-----------------------------------------------------------------------------------------
+//	Returns next transaction number.
+//	Used only for transactions stored in tables without autoincremented key.
+//
 
-    $sql = "SELECT type_no FROM ".TB_PREF."sys_types WHERE type_id = " . $trans_type;
+function get_next_trans_no ($trans_type){
 
-    $result = db_query($sql,"The next transaction number for $trans_type could not be retrieved");
-
-    $myrow = db_fetch_row($result);
+	$st = get_systype_db_info($trans_type);
 
-    $next_number = $myrow[0] + 1;
+	if (!($st && $st[0] && $st[2])) {
+		// this is in fact internal error condition.
+		display_error('Internal error: invalid type passed to get_next_trans_no()');
+		return 0;
+	}
+	$sql1 = "SELECT MAX(`$st[2]`) as last_no FROM $st[0]";
+	if ($st[1] != null)
+		 $sql1 .= " WHERE `$st[1]`=".db_escape($trans_type);
 
-    $sql = "UPDATE ".TB_PREF."sys_types SET type_no = $next_number WHERE type_id = $trans_type
-	AND type_no = ". $myrow[0]; //concurrency paranoic protection
+	// check also in voided transactions (some transactions like location transfer are removed completely)
+	$sql2 = "SELECT MAX(`id`) as last_no FROM ".TB_PREF."voided WHERE `type`=".db_escape($trans_type);
 
-    db_query($sql,"The next transaction number for $trans_type could not be updated");
+	$sql = "SELECT max(last_no) last_no FROM ($sql1 UNION $sql2) a";
+    $result = db_query($sql,"The next transaction number for $trans_type could not be retrieved");
+    $myrow = db_fetch_row($result);
 
-    return $next_number;
+    return $myrow[0] + 1;
 }
 
 //-----------------------------------------------------------------------------
@@ -48,7 +55,7 @@ function get_systype_db_info($type)
         case     ST_CUSTDELIVERY : return array("".TB_PREF."debtor_trans", "type", "trans_no", "reference", "tran_date");
         case     ST_LOCTRANSFER  : return array("".TB_PREF."stock_moves", "type", "trans_no", "reference", "tran_date");
         case     ST_INVADJUST    : return array("".TB_PREF."stock_moves", "type", "trans_no", "reference", "tran_date");
-        case     ST_PURCHORDER   : return array("".TB_PREF."purch_orders", null, "order_no", "reference", "tran_date");
+        case     ST_PURCHORDER   : return array("".TB_PREF."purch_orders", null, "order_no", "reference", "ord_date");
         case     ST_SUPPINVOICE  : return array("".TB_PREF."supp_trans", "type", "trans_no", "reference", "tran_date");
         case     ST_SUPPCREDIT   : return array("".TB_PREF."supp_trans", "type", "trans_no", "reference", "tran_date");
         case     ST_SUPPAYMENT   : return array("".TB_PREF."supp_trans", "type", "trans_no", "reference", "tran_date");
@@ -60,7 +67,7 @@ function get_systype_db_info($type)
         case     31              : return array("".TB_PREF."service_orders", null, "order_no", "cust_ref", "date");
         case     ST_SALESQUOTE   : return array("".TB_PREF."sales_orders", "trans_type", "order_no", "reference", "ord_date");
         case	 ST_DIMENSION    : return array("".TB_PREF."dimensions", null, "id", "reference", "date_");
-        case     ST_COSTUPDATE   : return null;
+        case     ST_COSTUPDATE   : return array("".TB_PREF."gl_trans", "type", "type_no", null, "tran_date");
 	}
 
 	display_db_error("invalid type ($type) sent to get_systype_db_info", "", true);