X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_invoice.php;h=f605fc6934084e7bd384a62366dc5d9dad5c4a1e;hb=9eec230b546ec5827a9c2e16570240318107006e;hp=6f7de98ae57e116528d70b40498204d500c475d6;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git
diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index 6f7de98a..f605fc69 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 600);
page(_($help_context = "View Sales Invoice"), true, false, "", $js);
@@ -45,11 +45,11 @@ display_heading(sprintf($myrow['prep_amount'] > 0 ? (
$paym['days_before_due']>=0 ? _("FINAL INVOICE #%d") : _("PREPAYMENT INVOICE #%d")) : _("SALES INVOICE #%d"),$trans_id));
echo "
";
-start_table(TABLESTYLE2, "width=95%");
+start_table(TABLESTYLE2, "width='95%'");
echo "
"; // outer table
/*Now the customer charged to details in a sub table*/
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
$th = array(_("Charge To"));
table_header($th);
@@ -63,7 +63,7 @@ echo " | "; // outer table
/*end of the main table showing the company name and charge to details */
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
$th = array(_("Charge Branch"));
table_header($th);
@@ -72,7 +72,7 @@ end_table();
echo " | "; // outer table
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
$th = array(_("Payment Terms"));
table_header($th);
label_row(null, $paym["terms"], "nowrap");
@@ -80,7 +80,7 @@ end_table();
echo " | "; // outer table
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
start_row();
label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
@@ -108,7 +108,7 @@ end_table(1); // outer table
$result = get_customer_trans_details(ST_SALESINVOICE, $trans_id);
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
if (db_num_rows($result) > 0)
{
@@ -148,15 +148,17 @@ if (db_num_rows($result) > 0)
$display_sub_tot = price_format($sub_total);
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
- "nowrap align=right width=15%");
+ "nowrap align=right width='15%'");
}
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"), ''.price_format($myrow['prep_amount']).'', "colspan=6 align=right",
+ "nowrap align=right");
end_table(1);
$voided = is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided."));
@@ -176,4 +181,3 @@ if (!$voided)
end_page(true, false, false, ST_SALESINVOICE, $trans_id);
-?>
\ No newline at end of file
|