Added company switch for placing company logo on certain views.

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

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index db9ab1031c86ca9a91826d99bb76ed20ca020687..6366251679182b5b9efc0a6b2eb91398259e057d 100644 (file)
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -41,6 +41,9 @@ $branch = get_branch($myrow["branch_code"]);
 
 $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 
+if (!empty($SysPrefs->prefs['company_logo_on_views']))
+       company_logo_on_view();
+
 display_heading(sprintf($myrow['prep_amount'] > 0 ? (
        $paym['days_before_due']>=0 ? _("FINAL INVOICE #%d") : _("PREPAYMENT INVOICE #%d")) : _("SALES INVOICE #%d"),$trans_id));
 
@@ -153,10 +156,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 +170,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."));