X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_sales_order.php;h=6f70b4173e6fa9fa9130c0335b14bb2b0222615f;hb=55c51a9db64c9fe402d615e204824f8e4cd6a310;hp=5f5c67712e0ae618945efabcddaf1adafef37fa2;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 5f5c6771..6f70b417 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -98,12 +98,13 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 	$delivery_total = 0;
 	$k = 0;
-
+	$dn_numbers = array();
+	
 	while ($del_row = db_fetch($result))
 	{
 
 		alt_table_row_color($k);
-
+		$dn_numbers[] = $del_row["trans_link"];
 		$this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"]  + $del_row["ov_gst"] ;
 		$delivery_total += $this_total;
 
@@ -125,11 +126,15 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 	$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 	table_header($th);
+	
+	$sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE
+		." AND trans_no IN(". implode(',', array_values($dn_numbers)).")";
 
 	$result = get_related_documents(ST_SALESINVOICE, $_GET['trans_no']);
 
 	$invoices_total = 0;
 	$k = 0;
+	$inv_numbers = array();
 
 	while ($inv_row = db_fetch($result))
 	{
@@ -139,6 +144,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 		$this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"]  + $inv_row["ov_gst"] + $inv_row["ov_amount"];
 		$invoices_total += $this_total;
 
+		$inv_numbers[] = $inv_row["trans_no"];
 		label_cell(get_customer_trans_view_str($inv_row["type"], $inv_row["trans_no"]));
 		label_cell($inv_row["reference"]);
 		label_cell(sql2date($inv_row["tran_date"]));
@@ -157,7 +163,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 	$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
 	table_header($th);
 
-	$result = get_related_documents(ST_CUSTCREDIT, $_GET['trans_no']);
+	$result = get_related_credits($inv_numbers);
 
 	$credits_total = 0;
 	$k = 0;