Allocation js functions moved to allocate.js

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

diff --git a/purchasing/supplier_invoice_grns.php b/purchasing/supplier_invoice_grns.php
index 04aaaea7526dfce88f108eb2ed6cb05410dadd2e..13f4d3040b78c7182b9b6c1d3668243e1ed07fdc 100644 (file)
--- a/purchasing/supplier_invoice_grns.php
+++ b/purchasing/supplier_invoice_grns.php
@@ -33,42 +33,43 @@ function check_data()
 {
        global $check_price_charged_vs_order_price,
                $check_qty_charged_vs_del_qty;
-       if (!is_numeric($_POST['this_quantity_inv'])) 
+       if (!check_num('this_quantity_inv', 0) || input_num('this_quantity_inv')==0) 
        {
-               display_error( _("The quantity to invoice must be numeric."));
+               display_error( _("The quantity to invoice must be numeric and greater than zero."));
+               set_focus('this_quantity_inv');
                return false;
        }
 
-       if ($_POST['this_quantity_inv'] <= 0) 
-       {
-               display_error( _("The quantity to invoice must be greater than zero."));
-               return false;
-       }
-
-       if (!is_numeric($_POST['ChgPrice']))
+       if (!check_num('ChgPrice'))
        {
                display_error( _("The price is not numeric."));
+               set_focus('ChgPrice');
                return false;
        }
 
        if ($check_price_charged_vs_order_price == True) 
        {
-               if ($_POST['ChgPrice']/$_POST['order_price'] > 
-                       (1 + (sys_prefs::over_charge_allowance() / 100)))
-               {
+               if ($_POST['order_price']!=input_num('ChgPrice')) {
+                    if ($_POST['order_price']==0 ||
+                       input_num('ChgPrice')/$_POST['order_price'] > 
+                           (1 + (sys_prefs::over_charge_allowance() / 100)))
+                   {
                        display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
                        _("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%");
+                       set_focus('ChgPrice');
                        return false;
+                   }
                }
        }
 
        if ($check_qty_charged_vs_del_qty == True) 
        {
-               if ($_POST['this_quantity_inv'] / ($_POST['qty_recd'] - $_POST['prev_quantity_inv']) > 
+               if (input_num('this_quantity_inv') / ($_POST['qty_recd'] - $_POST['prev_quantity_inv']) > 
                        (1+ (sys_prefs::over_charge_allowance() / 100)))
                {
                        display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
                        . _("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%");
+                       set_focus('this_quantity_inv');
                        return false;
                }
        }
@@ -83,7 +84,7 @@ if (isset($_POST['AddGRNToTrans']))
 
        if (check_data())
        {
-       if ($_POST['this_quantity_inv'] >= ($_POST['qty_recd'] - $_POST['prev_quantity_inv']))
+       if (input_num('this_quantity_inv') >= ($_POST['qty_recd'] - $_POST['prev_quantity_inv']))
        {
                $complete = True;
        } 
@@ -92,15 +93,10 @@ if (isset($_POST['AddGRNToTrans']))
                $complete = False;
        }
 
-               //$_SESSION['supp_trans']->add_grn_to_trans($_POST['GRNNumber'], $_POST['po_detail_item'],
-               //      $_POST['item_code'], $_POST['item_description'], $_POST['qty_recd'],
-               //      $_POST['prev_quantity_inv'], $_POST['this_quantity_inv'],
-               //      $_POST['order_price'], $_POST['ChgPrice'], $complete,
-               //      $_POST['std_cost_unit'], $_POST['gl_code']);
                $_SESSION['supp_trans']->add_grn_to_trans($_POST['GRNNumber'], $_POST['po_detail_item'],
                        $_POST['item_code'], $_POST['item_description'], $_POST['qty_recd'],
-                       $_POST['prev_quantity_inv'], $_POST['this_quantity_inv'],
-                       $_POST['order_price'], $_POST['ChgPrice'], $complete,
+                       $_POST['prev_quantity_inv'], input_num('this_quantity_inv'),
+                       $_POST['order_price'], input_num('ChgPrice'), $complete,
                        $_POST['std_cost_unit'], "");
        }
 }
@@ -175,7 +171,8 @@ function display_grn_items_for_selection()
             qty_cell($myrow["quantity_inv"]);
             qty_cell($myrow["qty_recd"] - $myrow["quantity_inv"]);
             amount_cell($myrow["unit_price"]);
-            amount_cell($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]));
+            amount_cell(round($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]),
+                          user_price_dec()));
                        end_row();
                        
                $i++;
@@ -213,9 +210,9 @@ if (isset($_POST['grn_item_id']) && $_POST['grn_item_id'] != "")
        label_cell($myrow['item_code']);
        label_cell($myrow['description']);
        qty_cell($myrow['QtyOstdg']);
-       text_cells(null, 'this_quantity_inv', $myrow['QtyOstdg'], 13, 15);
+       qty_cells(null, 'this_quantity_inv', qty_format($myrow['QtyOstdg']));
        amount_cell($myrow['unit_price']);
-       text_cells(null, 'ChgPrice', $myrow['unit_price'], 13, 15);
+       small_amount_cells(null, 'ChgPrice', price_format($myrow['unit_price']));
        end_row();
        end_table(1);;