X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_credit.php;h=7c2442e5f3c024a57d22cdad4289f33e4f9dbcb2;hb=947c0dddc6cb94572e1f0cafe6d8c5663c00d695;hp=d126fd48bdb7a79f5b56115ddcc9d3c1a27be56f;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index d126fd48..7c2442e5 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -71,7 +71,7 @@ label_cells(_("Currency"), $myrow["curr_code"], "class='tableheader2'");
 end_row();
 start_row();
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
-label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'");
+label_cells(_("Shipping"), $myrow["shipping"], "class='tableheader2'");
 end_row();
 comments_display_row(ST_CUSTCREDIT, $trans_id);
 end_table();
@@ -126,7 +126,6 @@ else
 	display_note(_("There are no line items on this credit note."), 1, 2);
 
 $display_sub_tot = price_format($sub_total);
-$display_freight = price_format($myrow["ov_freight"]);
 
 $credit_total = $myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"];
 $display_total = price_format($credit_total);
@@ -135,7 +134,11 @@ $display_total = price_format($credit_total);
 if ($sub_total != 0)
 	label_row(_("Sub Total"), $display_sub_tot, "colspan=6 align=right",
 		"nowrap align=right width='15%'");
-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_CUSTCREDIT, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);