X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_grn.php;h=236c462283ff316f328f76e81412a9378cc356ca;hb=17b390efcf904072b02ec866b2a427490471a260;hp=0df3c99458930ec1f1379646e8a80275f989f948;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 0df3c994..236c4622 100644
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -1,15 +1,28 @@
 <?php
-
-$page_security = 2;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/purchasing/includes/po_class.inc");
 
 include($path_to_root . "/includes/session.inc");
-page(_("View Purchase Order Delivery"), true);
+
+$js = "";
+if ($SysPrefs->use_popup_windows)
+	$js .= get_js_open_window(900, 500);
+page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js);
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
-if (!isset($_GET['trans_no'])) 
+if (!isset($_GET['trans_no']))
 {
 	die ("<BR>" . _("This page must be called with a Purchase Order Delivery number to review."));
 }
@@ -23,16 +36,16 @@ 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"));
-	
-table_header($th);	
+
+table_header($th);
 
 $total = 0;
 $k = 0;  //row colour counter
 
-foreach ($purchase_order->line_items as $stock_item) 
+foreach ($purchase_order->line_items as $stock_item)
 {
 
 	$line_total = $stock_item->qty_received * $stock_item->price;
@@ -42,24 +55,35 @@ foreach ($purchase_order->line_items as $stock_item)
 	label_cell($stock_item->stock_id);
 	label_cell($stock_item->item_description);
 	label_cell($stock_item->req_del_date, "nowrap align=right");
-	qty_cell($stock_item->qty_received);
+	$dec = get_qty_dec($stock_item->stock_id);
+	qty_cell($stock_item->qty_received, false, $dec);
 	label_cell($stock_item->units);
-	amount_cell($stock_item->price);
+	amount_decimal_cell($stock_item->price);
 	amount_cell($line_total);
-	qty_cell($stock_item->qty_inv);
+	qty_cell($stock_item->qty_inv, false, $dec);
 	end_row();
 
 	$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(25, $_GET['trans_no'], _("This delivery has been voided."));
+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']);
 
-?>