Added GRN voiding.

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 832b450ae2f43122ac64781954a6d9b53b402c01..faba6ea5a7ad1387a920c7c981129fa35e9bf4e8 100644 (file)
--- 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 a2f0a435a4cd9b68d24a6ad776d150f20b5a48d7..841ff08e4e0eb48c95c841c5756e196aad2d7a46 100644 (file)
--- 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 5ed21c3a3f407416491a1fec3535ef169061ec86..e0bda878b065de5b51b3e4fd36a9ed16904e08df 100644 (file)
--- 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);
        }