Stable merged into unstable again (due to failure on binary file during previous...

[fa-stable.git] / admin / db / voiding_db.inc

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 17d7a8daceb58b2ca57210f50b0abf76574ecc26..faba6ea5a7ad1387a920c7c981129fa35e9bf4e8 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -29,17 +29,21 @@ function void_transaction($type, $type_no, $date_, $memo_)
                        void_journal_trans($type, $type_no);
                        break;
 
-               case ST_BANKPAYMENT : // it's a payment
                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 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_CUSTPAYMENT : // it's a customer payment
                case ST_CUSTDELIVERY : // it's a customer dispatch
                        if (!exists_customer_trans($type, $type_no))
                                return false;
@@ -65,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