From: Joe <joe.hunt.consulting@gmail.com>
Date: Sun, 10 Jul 2022 22:33:09 +0000 (+0200)
Subject: Removed delivery in a batch cannot be voided after the invoice is made. Fixed.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=574a0069355e41196d783837a71e29ab938b284f;p=fa-stable.git

Removed delivery in a batch cannot be voided after the invoice is made. Fixed.
---

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 55ff9fb9..43580ae9 100644
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -53,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;