Merged changes from main CVS (up to 2.2.10)

[fa-stable.git] / sales / view / view_sales_order.php

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 5f5c67712e0ae618945efabcddaf1adafef37fa2..6f70b4173e6fa9fa9130c0335b14bb2b0222615f 100644 (file)
--- 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;