Costs Accruals: code cleanup.

[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 1c3d95b43f68c6d901f8943f48ef35d4ab300289..aab384b7c8c84f9d1bbe7479e8673627371f9ac6 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -67,6 +67,8 @@ start_row();
 label_cells(_("Ordered On"), $_SESSION['View']->document_date, "class='tableheader2'");
 if ($_GET['trans_type'] == ST_SALESQUOTE)
        label_cells(_("Valid until"), $_SESSION['View']->due_date, "class='tableheader2'");
+elseif ($_SESSION['View']->reference == "auto")
+       label_cells(_("Due Date"), $_SESSION['View']->due_date, "class='tableheader2'");
 else
        label_cells(_("Requested Delivery"), $_SESSION['View']->due_date, "class='tableheader2'");
 end_row();
@@ -88,7 +90,8 @@ label_cells(_("All Payments Allocated"), price_format($_SESSION['View']->sum_pai
 end_row();
 } else
        label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
-
+$shipping = get_item($_SESSION['View']->ship_via);
+label_row(_("Shipping"), $shipping['description'], "class='tableheader2'", "colspan=3");
 label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
        "class='tableheader2'", "colspan=3");
 label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");
@@ -181,7 +184,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
        $credits_total = 0;
 
-       if (get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
+       if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
                $k = 0;
 
                while ($credits_row = db_fetch($result))