Moving 2.0 development version to main trunk.

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

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 5aef438dbf296b041364794427365573258554a7..2dd72d379a638cc4adc4c11bc79c43400ec1c991 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -8,17 +8,19 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 function void_transaction($type, $type_no, $date_, $memo_)
 {
        $void_entry = get_voided_entry($type, $type_no);
-       
+
        if ($void_entry != null)
                return false;
-               
+
        switch ($type) {
                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);
                        break;
-                       
+
                case 1 : // it's a payment
                case 2 : // it's a deposit
                case 4 : // it's a transfer
@@ -26,62 +28,65 @@ function void_transaction($type, $type_no, $date_, $memo_)
                                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
                        if (!exists_customer_trans($type, $type_no))
                                return false;
                        post_void_customer_trans($type, $type_no);
                        break;
-                       
+
                case systypes::location_transfer() : // it's a stock transfer
                        if (get_stock_transfer_items($type_no) == null)
                                return false;
                        void_stock_transfer($type_no);
-                       break;                  
-                       
+                       break;
+
                case systypes::inventory_adjustment() : // 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
+                       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))
                                return false;
                        break;
-               
+
                case systypes::work_order() : // 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
                        if (!exists_work_order_issue($type_no))
                                return false;
                        void_work_order_issue($type_no);
                        break;
-                       
+
                case 29 : // it's a work order production
                        if (!exists_work_order_produce($type_no))
                                return false;
                        void_work_order_produce($type_no);
-                       break;                                                  
-                       
+                       break;
+
                case systypes::cost_update() : // it's a stock cost update
+                       return false;
                        break;
        }
-       
-       // only add an entry if it's actually been voided 
+
+       // only add an entry if it's actually been voided
        add_voided_entry($type, $type_no, $date_, $memo_);
-       
+
        return true;
 }
 
@@ -90,9 +95,9 @@ function void_transaction($type, $type_no, $date_, $memo_)
 function get_voided_entry($type, $type_no)
 {
        $sql = "SELECT * FROM ".TB_PREF."voided WHERE type=$type AND id=$type_no";
-       
+
        $result = db_query($sql, "could not query voided transaction table");
-       
+
        return db_fetch($result);
 }
 
@@ -102,9 +107,9 @@ function add_voided_entry($type, $type_no, $date_, $memo_)
 {
        $date = date2sql($date_);
        $sql = "INSERT INTO ".TB_PREF."voided (type, id, date_, memo_)
-               VALUES ($type, $type_no, '$date', '$memo_')";
-                               
-       db_query($sql, "could not add voided transaction entry");                               
+               VALUES ($type, $type_no, ".db_escape($date).", ".db_escape($memo_).")";
+
+       db_query($sql, "could not add voided transaction entry");
 }
 
 //--------------------------------------------------------------------------------------------------