X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=3d09c3d8a3eac70fbadeb3d27e775f7c7e817c40;hb=207ae289c358ff57c1adc55304a65b17a5dc4132;hp=c7e7cb134d34699128aa109c21302f3673df1877;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index c7e7cb13..3d09c3d8 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");
 
@@ -108,7 +112,7 @@ function display_po_receive_items()
 	$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'));
+	$taxes = $_SESSION['PO']->get_taxes(input_num('freight_cost'), true);
 	
 	$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['PO']->tax_included);
 
@@ -172,6 +176,13 @@ function can_process()
 		return false;
 	}
 
+	if (!is_date_in_fiscalyear($_POST['DefaultReceivedDate'])) 
+	{
+		display_error(_("The entered date is not in fiscal year"));
+		set_focus('DefaultReceivedDate');
+		return false;
+	}
+
     if (!$Refs->is_valid($_POST['ref']))
     {
 		display_error(_("You must enter a reference."));