X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fvoiding_db.inc;h=faba6ea5a7ad1387a920c7c981129fa35e9bf4e8;hb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;hp=e8a3f14fdbd69966320d72b9a47509b40a06022c;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index e8a3f14f..faba6ea5 100644
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -16,41 +16,43 @@ 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)
 		return false;
 
 	switch ($type) {
-		case 0 : // it's a journal entry
+		case ST_JOURNAL : // it's a journal entry
 			if (!exists_gl_trans($type, $type_no))
 				return false;
 			void_journal_trans($type, $type_no);
 			break;
 
-		case 1 : // it's a payment
-		case 2 : // it's a deposit
-		case 4 : // it's a transfer
+		case ST_BANKDEPOSIT : // it's a deposit
+		case ST_BANKTRANSFER : // it's a transfer
+			if (!check_void_bank_trans($type, $type_no))
+				return false;
+		case ST_BANKPAYMENT : // it's a payment
 			if (!exists_bank_trans($type, $type_no))
 				return false;
 			void_bank_trans($type, $type_no);
 			break;
 
-		case 10 : // it's a customer invoice
-		case 11 : // it's a customer credit note
-		case 12 : // it's a customer payment
-		case 13 : // it's a customer dispatch
+		case ST_CUSTPAYMENT : // it's a customer payment
+			if (!check_void_bank_trans($type, $type_no))
+				return false;
+		case ST_SALESINVOICE : // it's a customer invoice
+		case ST_CUSTCREDIT : // it's a customer credit note
+		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;
 
@@ -66,12 +68,15 @@ function void_transaction($type, $type_no, $date_, $memo_)
 			void_stock_adjustment($type_no);
 			break;
 
-		case 18 : // it's a PO
-		case 25 : // it's a GRN
+		case ST_PURCHORDER : // it's a PO
 			return false;
-		case 20 : // it's a suppler invoice
-		case 21 : // it's a supplier credit note
-		case 22 : // it's a supplier payment
+
+		case ST_SUPPRECEIVE : // it's a GRN
+			if (exists_grn_on_invoices($type_no))
+				return false;
+		case ST_SUPPINVOICE : // it's a suppler invoice
+		case ST_SUPPCREDIT : // it's a supplier credit note
+		case ST_SUPPAYMENT : // it's a supplier payment
 			if (!exists_supp_trans($type, $type_no))
 				return false;
 			if (!post_void_supp_trans($type, $type_no))
@@ -84,20 +89,20 @@ function void_transaction($type, $type_no, $date_, $memo_)
 			void_work_order($type_no);
 			break;
 
-		case 28 : // it's a work order issue
+		case ST_MANUISSUE : // it's a work order issue
 			if (!exists_work_order_issue($type_no))
 				return false;
 			void_work_order_issue($type_no);
 			break;
 
-		case 29 : // it's a work order production
+		case ST_MANURECEIVE : // it's a work order production
 			if (!exists_work_order_produce($type_no))
 				return false;
 			void_work_order_produce($type_no);
 			break;
 
-		case 30: // it's a sales order
-		case 32: // it's a sales quotation
+		case ST_SALESORDER: // it's a sales order
+		case ST_SALESQUOTE: // it's a sales quotation
 			return false;
 
 		case ST_COSTUPDATE : // it's a stock cost update
@@ -108,6 +113,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 +121,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 +135,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");
 }