X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_invoice.php;h=f605fc6934084e7bd384a62366dc5d9dad5c4a1e;hb=a3616fe8abf36ba9a2ba9ba63689475b1c8978b8;hp=db9ab1031c86ca9a91826d99bb76ed20ca020687;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index db9ab103..f605fc69 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -153,10 +153,12 @@ if (db_num_rows($result) > 0)
 else
 	display_note(_("There are no line items on this invoice."), 1, 2);
 
-$display_freight = price_format($myrow["ov_freight"]);
-
 /*Print out the invoice text entered */
-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_SALESINVOICE, $trans_id);
 display_customer_trans_tax_details($tax_items, 6);
@@ -165,6 +167,9 @@ $display_total = price_format($myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_a
 
 label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right",
 	"nowrap align=right");
+if ($myrow['prep_amount'])
+	label_row(_("PREPAYMENT AMOUNT INVOICED"), '<b>'.price_format($myrow['prep_amount']).'</b>', "colspan=6 align=right",
+		"nowrap align=right");
 end_table(1);
 
 $voided = is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided."));