X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_grn.php;h=b2d95bb8e26390226249069d414976456536ef51;hb=9044444ee1933dc684c6aab26ac718e65ce8c370;hp=b0c37d7f7c85b29cc08595f9b9a3ac4017eb35bb;hpb=b0cae8d32b732118c4af739893cdbd7387cbc1f0;p=fa-stable.git

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index b0c37d7f..b2d95bb8 100644
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -9,16 +9,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
-$path_to_root="../..";
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 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(_("View Purchase Order Delivery"), true, false, "", $js);
+page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js);
 
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
@@ -36,21 +36,31 @@ display_grn_summary($purchase_order);
 
 display_heading2(_("Line Details"));
 
-start_table("colspan=9 $table_style width=90%");
-$th = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"),
+start_table(TABLESTYLE, "width='90%'");
+$th = array(_("Item Code"), _("Item Description"), _("Required by"), _("Quantity"),
 	_("Unit"), _("Price"), _("Line Total"), _("Quantity Invoiced"));
 
 table_header($th);
 
 $total = 0;
 $k = 0;  //row colour counter
+$overdue_items = false;
 
 foreach ($purchase_order->line_items as $stock_item)
 {
 
 	$line_total = $stock_item->qty_received * $stock_item->price;
 
-	alt_table_row_color($k);
+	// if overdue and outstanding quantities, then highlight as so
+	if (date1_greater_date2($purchase_order->orig_order_date, $stock_item->req_del_date))
+	{
+    	start_row("class='overduebg'");
+    	$overdue_items = true;
+	}
+	else
+	{
+		alt_table_row_color($k);
+	}
 
 	label_cell($stock_item->stock_id);
 	label_cell($stock_item->item_description);
@@ -66,14 +76,27 @@ 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(25, $_GET['trans_no'], _("This delivery has been voided."));
+if ($overdue_items)
+	display_note(_("Marked items were delivered overdue."), 0, 0, "class='overduefg'");
+
+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']);
 
-?>