Workaround for segfaults in some buggy php encoding library versions.

[fa-stable.git] / purchasing / view / view_grn.php

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 71b5d12072372d70fbf2cab989a5da7afef56780..236c462283ff316f328f76e81412a9378cc356ca 100644 (file)
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -16,7 +16,7 @@ include($path_to_root . "/purchasing/includes/po_class.inc");
 include($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
 page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js);
 
@@ -36,7 +36,7 @@ display_grn_summary($purchase_order);
 
 display_heading2(_("Line Details"));
 
-start_table("colspan=9 $table_style width=90%");
+start_table(TABLESTYLE, "width='90%'");
 $th = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"),
        _("Unit"), _("Price"), _("Line Total"), _("Quantity Invoiced"));
 
@@ -66,14 +66,24 @@ foreach ($purchase_order->line_items as $stock_item)
        $total += $line_total;
 }
 
-$display_total = number_format2($total,user_price_dec());
-label_row(_("Total Excluding Tax/Shipping"),  $display_total,
-       "colspan=6", "nowrap align=right");
+$display_sub_tot = number_format2($total,user_price_dec());
+label_row(_("Sub Total"), $display_sub_tot,
+       "align=right colspan=6", "nowrap align=right", 1);
+
+$taxes = $purchase_order->get_taxes();
+$tax_total = display_edit_tax_items($taxes, 6, $purchase_order->tax_included, 1);
+
+$display_total = price_format(($total + $tax_total));
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('');
+end_row();
+
 
 end_table(1);
 
 is_voided_display(ST_SUPPRECEIVE, $_GET['trans_no'], _("This delivery has been voided."));
 
-end_page(true);
+end_page(true, false, false, ST_SUPPRECEIVE, $_GET['trans_no']);
 
-?>