Password reset mail could take several hours. After fix only a couple of seconds...

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

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 5d3f28d14917cde55d3224d67cb232f2f366828d..fcd7348b4e9b2fd72f3fa5153db533044c48892d 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");
 
@@ -53,10 +57,8 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
 
 function display_po_receive_items()
 {
-       global $table_style;
-
        div_start('grn_items');
-    start_table("colspan=7 $table_style width=90%");
+    start_table(TABLESTYLE, "colspan=7 width='90%'");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
        _("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
     table_header($th);
@@ -105,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();
 }
@@ -118,11 +131,11 @@ function check_po_changed()
 {
        /*Now need to check that the order details are the same as they were when they were read
        into the Items array. If they've changed then someone else must have altered them */
-       // Sherifoz 22.06.03 Compare against COMPLETED items only !!
+       // Compare against COMPLETED items only !!
        // Otherwise if you try to fullfill item quantities separately will give error.
        $result = get_po_items($_SESSION['PO']->order_no);
 
-       $line_no = 1;
+       $line_no = 0;
        while ($myrow = db_fetch($result))
        {
                $ln_item = $_SESSION['PO']->line_items[$line_no];
@@ -148,7 +161,7 @@ function check_po_changed()
 
 function can_process()
 {
-       global $SysPrefs, $Refs;
+       global $SysPrefs;
        
        if (count($_SESSION['PO']->line_items) <= 0)
        {
@@ -162,17 +175,14 @@ function can_process()
                set_focus('DefaultReceivedDate');
                return false;
        }
-
-    if (!$Refs->is_valid($_POST['ref']))
-    {
-               display_error(_("You must enter a reference."));
-               set_focus('ref');
+       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 (!is_new_reference($_POST['ref'], ST_SUPPRECEIVE))
+       if (!check_reference($_POST['ref'], ST_SUPPRECEIVE))
        {
-               display_error(_("The entered reference is already in use."));
                set_focus('ref');
                return false;
        }
@@ -246,6 +256,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);
 
@@ -262,7 +273,8 @@ if (isset($_GET['PONumber']) && $_GET['PONumber'] > 0 && !isset($_POST['Update']
 {
        create_new_po(ST_PURCHORDER, $_GET['PONumber']);
        $_SESSION['PO']->trans_type = ST_SUPPRECEIVE;
-       $_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE);
+       $_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE, 
+               array('date' => Today(), 'supplier' => $_SESSION['PO']->supplier_id));
        copy_from_cart();
 }
 
@@ -305,7 +317,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();
 
@@ -316,7 +328,4 @@ submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear
 end_form();
 
 //--------------------------------------------------------------------------------------------------
-
 end_page();
-?>
-