This was bad idea. The problem should be solved on php side.

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

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 36fb7d876ba2c6667b3c8e7265ca8c70764453e9..e81dd1b0dfc848376edd0fd44b27269cf05fb4f4 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -32,8 +32,20 @@ function void_transaction($type, $type_no, $date_, $memo_)
                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;
+                       if ($type == 13)        // added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO.
+                       {
+                               $delivery = get_customer_trans($type_no, $type);
+                               if ($delivery['trans_link'] != 0)
+                               {
+                                       $inv = get_customer_trans($delivery['trans_link'], 10);
+                                       if ($inv['ov_amount'] != 0 || $inv['ov_discount'] != 0 || $inv['ov_gst'] != 0 || 
+                                               $inv['ov_freight'] != 0 || $inv['ov_freight_tax'] != 0 || $inv['alloc'] != 0)
+                                               return false;
+                               }
+                       }       
                        post_void_customer_trans($type, $type_no);
                        break;
 
@@ -49,10 +61,11 @@ function void_transaction($type, $type_no, $date_, $memo_)
                        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))
@@ -78,6 +91,7 @@ function void_transaction($type, $type_no, $date_, $memo_)
                        break;
 
                case systypes::cost_update() : // it's a stock cost update
+                       return false;
                        break;
        }
 
@@ -104,7 +118,7 @@ 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_')";
+               VALUES ($type, $type_no, ".db_escape($date).", ".db_escape($memo_).")";
 
        db_query($sql, "could not add voided transaction entry");
 }