X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fvoiding_db.inc;h=17d7a8daceb58b2ca57210f50b0abf76574ecc26;hb=67ec1888ea14a50f6df62e0599e50d209e7b0c6c;hp=553240c2b016c1d2220d930529d0dd244b21afe6;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 553240c2..17d7a8da 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_lines($type, $type_no, false); // 2011-03-17 This had been changed. Joe
+				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;
 }