Bug 5682: Voided Invoices and PO Deliveries showing up in inquiries. Fixed.

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

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index c87fe17fa07bc95b82de12a8d0d4d462b292c951..7f3ddc21c432d69b22da0cd518bc8ab407cf5799 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -26,6 +26,8 @@ function void_transaction($type, $type_no, $date_, $memo_)
                case ST_JOURNAL : // it's a journal entry
                        if (!exists_gl_trans($type, $type_no))
                                return _('Selected transaction does not exists.');
+                       if ($wo = check_wo_costing($type, $type_no))
+                               return sprintf(_('This transaction cannot be voided because it is part of Work Order %s costs.'), $wo);
                        void_journal_trans($type, $type_no);
                        break;
 
@@ -43,7 +45,7 @@ function void_transaction($type, $type_no, $date_, $memo_)
                        if (!check_void_bank_trans($type, $type_no))
                                return _('This transaction cannot be voided because the operation would decrease account balance below allowed limit in some point of account history.');
                case ST_SALESINVOICE : // it's a customer invoice
-                       if (is_cust_invoice_credited($type_no))
+                       if ($type == ST_SALESINVOICE && is_cust_invoice_credited($type_no))
                                return _('This invoice cannot be voided because it was already credited.');
                case ST_CUSTCREDIT : // it's a customer credit note
                case ST_CUSTDELIVERY : // it's a customer dispatch
@@ -51,9 +53,12 @@ function void_transaction($type, $type_no, $date_, $memo_)
                                return _('Selected transaction does not exists.');
                        if ($type == ST_CUSTDELIVERY)   // added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO.
                        {
-                               $childs = get_sales_child_lines($type, $type_no, false); // 2011-03-17 This had been changed. Joe
-                               if ($childs && db_num_rows($childs))
-                                       return _('This delivery cannot be voided because it was already invoiced.');
+                               $vers = get_customer_trans_version($type, $type_no);
+                               if ($vers[$type_no] == 1) {
+                                       $childs = get_sales_child_lines($type, $type_no, false); // 2011-03-17 This had been changed. Joe
+                                       if ($childs && db_num_rows($childs))
+                                               return _('This delivery cannot be voided because it was already invoiced.');
+                               }
                        }
                        post_void_customer_trans($type, $type_no);
                        break;