From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Tue, 21 Jun 2011 13:37:01 +0000 (+0200)
Subject: Added GRN voiding.
X-Git-Tag: 2.3-final~612
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=45acd0b8e74eb9c1cdcdb443ccdda8475f115acb;p=fa-stable.git

Added GRN voiding.
---

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 832b450a..faba6ea5 100644
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -69,8 +69,11 @@ function void_transaction($type, $type_no, $date_, $memo_)
 			break;
 
 		case ST_PURCHORDER : // it's a PO
-		case ST_SUPPRECEIVE : // it's a GRN
 			return false;
+
+		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
diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index a2f0a435..841ff08e 100644
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -70,8 +70,13 @@ function exist_transaction($type, $type_no)
 			break;
 
 		case ST_PURCHORDER : // it's a PO
-		case ST_SUPPRECEIVE : // it's a GRN
 			return false;
+
+		case ST_SUPPRECEIVE : // it's a GRN
+			if (exists_grn_on_invoices($type_no))
+				return false;
+			break;
+
 		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
@@ -140,8 +145,7 @@ function voiding_controls()
 {
 	global $selected_id;
 
-	$not_implemented =  array(ST_PURCHORDER, ST_SUPPRECEIVE, ST_SALESORDER, 
-		ST_SALESQUOTE, ST_COSTUPDATE);
+	$not_implemented =  array(ST_PURCHORDER, ST_SALESORDER, ST_SALESQUOTE, ST_COSTUPDATE);
 
 	start_form();
 
diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 5ed21c3a..e0bda878 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -153,7 +153,7 @@ function post_void_supp_trans($type, $type_no)
 		return true;
 	}
 
-	if ($type == SUPPRECEIVE)
+	if ($type == ST_SUPPRECEIVE)
 	{
 	 	return void_grn($type_no);
 	}