From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 11 Dec 2008 23:27:21 +0000 (+0000)
Subject: Changed so document Sales Invoice now shows delivery notes instead of sales order
X-Git-Tag: v2.4.2~19^2~1673
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=906fc86a0a567a32448a98a833a286ce44332af3;p=fa-stable.git

Changed so document Sales Invoice now shows delivery notes instead of sales order
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d72a3c8c..629681fa 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+12-Dec-2008 Joe Hunt
+! Changed so document Sales Invoice now shows delivery notes instead of sales order
+$ /reporting/includes/header2.inc
+.
 11-Dec-2008 Joe Hunt
 + Two new fields in company table, accumulate_shipping and logal_text
   Accumulat shipping is for accumulating shipping on batch invoice
diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index f1cadabb..ebbbe155 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -169,7 +169,10 @@
 		$col += $width;
 		$this->TextWrap($col, $this->row, $width, $doc_Your_VAT_no, 'C');
 		$col += $width;
-		$this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C');
+		if ($doctype == 10)
+			$this->TextWrap($col, $this->row, $width, $doc_Delivery_no, 'C');
+		else
+			$this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C');
 		$col += $width;
 		$this->TextWrap($col, $this->row, $width, $doc_Payment_Terms, 'C');
 		$col += $width;
@@ -191,7 +194,20 @@
 		if ($doctype != 8 && isset($myrow['tax_id']))
 			$this->TextWrap($col, $this->row, $width, $myrow['tax_id'], 'C');
 		$col += $width;	
-		if (isset($myrow['order_']))
+		if ($doctype == 10)
+		{
+			$deliveries = get_parent_trans(10,$myrow['trans_no']);
+			$line = "";
+			foreach ($deliveries as $delivery)
+			{
+				if ($line == "")
+					$line .= "$delivery";
+				else
+					$line .= ",$delivery";
+			}		
+			$this->TextWrap($col, $this->row, $width, $line, 'C');
+		}
+		elseif (isset($myrow['order_']))
 			$this->TextWrap($col, $this->row, $width, $myrow['order_'], 'C');
 		$col += $width;	
 		$id = $myrow['payment_terms'];