X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fvoiding_db.inc;h=62165c1fbf2206d48a1bb7c10dfb22291f40a80e;hb=69fde1eed360af911850c868e86fb2f63700195b;hp=8efc0036dbdd0d13451545894da9200601ce363a;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 8efc0036..62165c1f 100644
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -16,6 +16,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 
 function void_transaction($type, $type_no, $date_, $memo_)
 {
+	global $Refs;
 	$void_entry = get_voided_entry($type, $type_no);
 
 	if ($void_entry != null)
@@ -42,15 +43,12 @@ function void_transaction($type, $type_no, $date_, $memo_)
 		case ST_CUSTDELIVERY : // it's a customer dispatch
 			if (!exists_customer_trans($type, $type_no))
 				return false;
-			if ($type == 13)	// added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO.
+			if ($type == ST_CUSTDELIVERY)	// added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO.
 			{
-				$delivery = get_customer_trans($type_no, $type);
-				if ($delivery['trans_link'] != 0)
-				{
-					if (get_voided_entry(10, $delivery['trans_link']) === false)
+				$childs = get_sales_child_trans($type_no, $type);
+				if ($childs && db_num_rows($childs))
 						return false;
-				}
-			}	
+			}
 			post_void_customer_trans($type, $type_no);
 			break;
 
@@ -108,6 +106,7 @@ function void_transaction($type, $type_no, $date_, $memo_)
 	// only add an entry if it's actually been voided
 	add_audit_trail($type, $type_no, $date_, _("Voided.")."\n".$memo_);
 	add_voided_entry($type, $type_no, $date_, $memo_);
+	$Refs->restore_last($type, $type_no);
 	return true;
 }
 
@@ -115,7 +114,8 @@ function void_transaction($type, $type_no, $date_, $memo_)
 
 function get_voided_entry($type, $type_no)
 {
-	$sql = "SELECT * FROM ".TB_PREF."voided WHERE type=$type AND id=$type_no";
+	$sql = "SELECT * FROM ".TB_PREF."voided WHERE type=".db_escape($type)
+		." AND id=".db_escape($type_no);
 
 	$result = db_query($sql, "could not query voided transaction table");
 
@@ -128,7 +128,8 @@ function add_voided_entry($type, $type_no, $date_, $memo_)
 {
 	$date = date2sql($date_);
 	$sql = "INSERT INTO ".TB_PREF."voided (type, id, date_, memo_)
-		VALUES ($type, $type_no, ".db_escape($date).", ".db_escape($memo_).")";
+		VALUES (".db_escape($type).", ".db_escape($type_no).", "
+		.db_escape($date).", ".db_escape($memo_).")";
 
 	db_query($sql, "could not add voided transaction entry");
 }