From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 21 Apr 2010 08:20:52 +0000 (+0000)
Subject: Deleting a Sales Order with reference to a voided delivery causes SQL error when
X-Git-Tag: 2.3-final~920
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=877a4141d9060f3ad59d82abadfbec1ee2635669;p=fa-stable.git

Deleting a Sales Order with reference to a voided delivery causes SQL error when
looking at this delivery. Solution, can't delete, but set the deliveries to 0
on the lines.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3008492a..6e513076 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Apr-2010 Joe Hunt
+# Deleting a Sales Order with reference to a voided delivery causes SQL error when
+  looking at this delivery. Solution, can't delete, but set the deliveries to 0
+  on the lines.
+$ /sales/includes/db/sales_order_db.inc
+
 ------------------------------- Release 2.2.8 ----------------------------------
 18-Apr-2010
 ! Release 2.2.8
diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 79d5adc9..b12011d4 100644
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -390,7 +390,11 @@ function sales_order_has_deliveries($order_no)
 
 	$row = db_fetch_row($result);
 
-	return ($row[0] > 0);
+	if ($row[0] > 0)
+		return true;  // 2010-04-21 added check for eventually voided deliveries, Joe Hunt
+	$sql = "SELECT order_ FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTDELIVERY." AND order_=".db_escape($order_no);
+	$result = db_query($sql,"The related delivery notes could not be retreived");
+	return (db_num_rows($result) > 0);	
 }
 
 //----------------------------------------------------------------------------------------