Attachments were not moved to new transaction after edition for some document types.

[fa-stable.git] / purchasing / po_receive_items.php

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index c7e7cb134d34699128aa109c21302f3673df1877..30d18878855caa7789370ad250e0464e688b2a73 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -18,9 +18,9 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js);
 
@@ -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);
 
@@ -171,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']))
     {
@@ -255,6 +264,7 @@ function process_receive_po()
        $grn->orig_order_date = $_POST['DefaultReceivedDate'];
        $grn->reference = $_POST['ref'];
        $grn->Location = $_POST['Location'];
+       $grn->ex_rate = input_num('_ex_rate', null);
 
        $grn_no = add_grn($grn);
 
@@ -314,7 +324,7 @@ if (isset($_POST['ProcessGoodsReceived']))
 
 start_form();
 
-display_grn_summary($_SESSION['PO'], true);
+edit_grn_summary($_SESSION['PO'], true);
 display_heading(_("Items to Receive"));
 display_po_receive_items();
 
@@ -326,5 +336,3 @@ end_form();
 
 //--------------------------------------------------------------------------------------------------
 end_page();
-?>
-