X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fdb%2Fvoiding_db.inc;h=1447bd9b2b1c8d2e074f466a17867ee14331a178;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=b90194ff04103e158c27b5a87a390ea61caeac14;hpb=f00216978947d0fd076550f1969430265a270ce7;p=fa-stable.git

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index b90194ff..1447bd9b 100644
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
@@ -16,9 +25,7 @@ function void_transaction($type, $type_no, $date_, $memo_)
 		case 0 : // it's a journal entry
 			if (!exists_gl_trans($type, $type_no))
 				return false;
-			void_gl_trans($type, $type_no);
-			if (exists_bank_trans($type, $type_no))
-				void_bank_trans($type, $type_no);
+			void_journal_trans($type, $type_no);
 			break;
 
 		case 1 : // it's a payment
@@ -35,6 +42,15 @@ function void_transaction($type, $type_no, $date_, $memo_)
 		case 13 : // 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.
+			{
+				$delivery = get_customer_trans($type_no, $type);
+				if ($delivery['trans_link'] != 0)
+				{
+					if (get_voided_entry(10, $delivery['trans_link']) === false)
+						return false;
+				}
+			}	
 			post_void_customer_trans($type, $type_no);
 			break;
 
@@ -50,10 +66,11 @@ function void_transaction($type, $type_no, $date_, $memo_)
 			void_stock_adjustment($type_no);
 			break;
 
+		case 25 : // it's a GRN
+			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 25 : // it's a GRN
 			if (!exists_supp_trans($type, $type_no))
 				return false;
 			if (!post_void_supp_trans($type, $type_no))
@@ -79,12 +96,13 @@ function void_transaction($type, $type_no, $date_, $memo_)
 			break;
 
 		case systypes::cost_update() : // it's a stock cost update
+			return false;
 			break;
 	}
 
 	// 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_);
-
 	return true;
 }