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 2fa6968ba4ea28110df9402d2158a11ad8577a0a..6f70b4173e6fa9fa9130c0335b14bb2b0222615f 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -41,7 +41,7 @@ if (isset($_SESSION['View']))
 
 $_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
 
-start_table("$table_style2 width=95%", 5);
+start_table(TABLESTYLE2, "width=95%", 5);
 echo "<tr valign=top><td>";
 display_heading2(_("Order Information"));
 if ($_GET['trans_type'] != ST_SALESQUOTE)
@@ -55,7 +55,7 @@ echo "</td></tr>";
 
 echo "<tr valign=top><td>";
 
-start_table("$table_style width=95%");
+start_table(TABLESTYLE, "width=95%");
 label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
        "colspan=3");
 start_row();
@@ -87,7 +87,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 {
        echo "</td><td valign='top'>";
 
-       start_table($table_style);
+       start_table(TABLESTYLE);
        display_heading2(_("Delivery Notes"));
 
 
@@ -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;
 
@@ -120,16 +121,20 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
        end_table();
        echo "</td><td valign='top'>";
 
-       start_table($table_style);
+       start_table(TABLESTYLE);
        display_heading2(_("Sales Invoices"));
 
        $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"]));
@@ -153,11 +159,11 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
        display_heading2(_("Credit Notes"));
 
-       start_table($table_style);
+       start_table(TABLESTYLE);
        $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;
@@ -193,7 +199,7 @@ if ($_SESSION['View']->so_type == 1)
        display_note(_("This Sales Order is used as a Template."), 0, 0, "class='currentfg'");
 display_heading2(_("Line Details"));
 
-start_table("colspan=9 width=95% $table_style");
+start_table(TABLESTYLE, "colspan=9 width=95%");
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
        _("Price"), _("Discount"), _("Total"), _("Quantity Delivered"));
 table_header($th);