Merged bugfixes upto [0000072] (version 2.0.3).

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

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 2dd72d379a638cc4adc4c11bc79c43400ec1c991..e81dd1b0dfc848376edd0fd44b27269cf05fb4f4 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -35,6 +35,17 @@ function void_transaction($type, $type_no, $date_, $memo_)
                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;