Costs Accruals: code cleanup.

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

diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 300c67f4d39140026a3b21fa49345281eae450aa..69f1534e01067a2c9cf2d3c8b6f136bc92187fd2 100644 (file)
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -89,7 +89,7 @@ label_cells(_("Our Order No"),
 end_row();
 start_row();
 label_cells(_("Customer Order Ref."), $sales_order["customer_ref"], "class='tableheader2'");
-label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
+label_cells(_("Shipping"), $myrow["shipping"], "class='tableheader2'");
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
 end_row();
 start_row();
@@ -149,10 +149,11 @@ if (db_num_rows($result) > 0)
 }
 else
        display_note(_("There are no line items on this dispatch."), 1, 2);
-
-$display_freight = price_format($myrow["ov_freight"]);
-
-label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+if ($myrow['ov_freight'] != 0.0)
+{
+       $display_freight = price_format($myrow["ov_freight"]);
+       label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+}
 
 $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);