X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=83900c865a0458592d0532360f48cb880875ff79;hb=c75b19a492e4b9ad53c9c0a47b87ad0abb687921;hp=b536ba82b1a2e8a4bc265ae7c93f5a879976cc74;hpb=3cf9ab70d79ebd01b13b6cc0c9366ccb5b8c496a;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index b536ba82..83900c86 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -34,6 +34,10 @@ if (isset($_GET['AddedID']))
 	display_notification_centered(_("Purchase Order Delivery has been processed"));
 
 	display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery")));
+	
+    $clearing_act = get_company_pref('grn_clearing_act');
+	if ($clearing_act)	
+		display_note(get_gl_view_str($trans_type, $grn, _("View the GL Journal Entries for this Delivery")), 1);
 
 	hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
 
@@ -103,9 +107,20 @@ function display_po_receive_items()
        	}
     }
 
-    $display_total = number_format2($total,user_price_dec());
-    label_row(_("Total value of items received"), $display_total, "colspan=8 align=right",
-    	"nowrap align=right");
+	$colspan = count($th)-1;
+
+	$display_sub_total = price_format($total/* + input_num('freight_cost')*/);
+
+	label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
+	$taxes = $_SESSION['PO']->get_taxes(input_num('freight_cost'), true);
+	
+	$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['PO']->tax_included);
+
+	$display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+
+	start_row();
+	label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
+	end_row();
     end_table();
 	div_end();
 }
@@ -160,6 +175,11 @@ function can_process()
 		set_focus('DefaultReceivedDate');
 		return false;
 	}
+	if (!is_date_in_fiscalyear($_POST['DefaultReceivedDate'])) {
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+		set_focus('DefaultReceivedDate');
+		return false;
+	}
 
     if (!$Refs->is_valid($_POST['ref']))
     {
@@ -314,7 +334,6 @@ submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear
 end_form();
 
 //--------------------------------------------------------------------------------------------------
-
 end_page();
 ?>