Removed not used yet ajax stuff, added combo class binding and setFocus()

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

diff --git a/purchasing/supplier_invoice_grns.php b/purchasing/supplier_invoice_grns.php
index 8cea6d8ec1564765d7bb64480665805522762fe6..3ba94c099f260d489b8802d05857a1c5f5b195f7 100644 (file)
--- a/purchasing/supplier_invoice_grns.php
+++ b/purchasing/supplier_invoice_grns.php
@@ -47,12 +47,15 @@ function check_data()
 
        if ($check_price_charged_vs_order_price == True) 
        {
-               if (input_num('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() . "%");
                        return false;
+                   }
                }
        }
 
@@ -164,7 +167,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++;
@@ -202,7 +206,7 @@ if (isset($_POST['grn_item_id']) && $_POST['grn_item_id'] != "")
        label_cell($myrow['item_code']);
        label_cell($myrow['description']);
        qty_cell($myrow['QtyOstdg']);
-       amount_cells(null, 'this_quantity_inv', qty_format($myrow['QtyOstdg']));
+       qty_cells(null, 'this_quantity_inv', qty_format($myrow['QtyOstdg']));
        amount_cell($myrow['unit_price']);
        small_amount_cells(null, 'ChgPrice', price_format($myrow['unit_price']));
        end_row();