Update from usntable branch.

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

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 59e3680d2ab9ed08e617e9352136791922485d4d..553240c2b016c1d2220d930529d0dd244b21afe6 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -22,24 +22,24 @@ function void_transaction($type, $type_no, $date_, $memo_)
                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_BANKPAYMENT : // it's a payment
+               case ST_BANKDEPOSIT : // it's a deposit
+               case ST_BANKTRANSFER : // it's a transfer
                        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_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;
                        if ($type == 13)        // added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO.
@@ -54,55 +54,60 @@ function void_transaction($type, $type_no, $date_, $memo_)
                        post_void_customer_trans($type, $type_no);
                        break;
 
-               case systypes::location_transfer() : // it's a stock transfer
+               case ST_LOCTRANSFER : // it's a stock transfer
                        if (get_stock_transfer_items($type_no) == null)
                                return false;
                        void_stock_transfer($type_no);
                        break;
 
-               case systypes::inventory_adjustment() : // it's a stock adjustment
+               case ST_INVADJUST : // it's a stock adjustment
                        if (get_stock_adjustment_items($type_no) == null)
                                return false;
                        void_stock_adjustment($type_no);
                        break;
 
-               case 25 : // it's a GRN
+               case ST_PURCHORDER : // it's a PO
+               case ST_SUPPRECEIVE : // 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 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))
                                return false;
                        break;
 
-               case systypes::work_order() : // it's a work order
+               case ST_WORKORDER : // it's a work order
                        if (!get_work_order($type_no, true))
                                return false;
                        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 systypes::cost_update() : // it's a stock cost update
+               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
                        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;
 }