Improved layout of Supplier Invoice/Credit. All Items can now be added in one sweep.

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

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 9341a11cc1f403771899605fd9dd0d2bc726fc16..9f2f1cc167e4b22df8071f47a09afc64ae55aaa6 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -82,7 +82,7 @@ function clear_fields()
        unset($_POST['amount']);
        unset($_POST['memo_']);
        unset($_POST['AddGLCodeToTrans']);
-       $Ajax->activate('gl_ctrls');
+       $Ajax->activate('gl_items');
        set_focus('gl_code');
 }
 //------------------------------------------------------------------------------------------------
@@ -263,12 +263,11 @@ function check_item_data($n)
        return true;
 }
 
-$id = find_submit('grn_item_id');
-if ($id != -1)
+function commit_item_data($n)
 {
-       if (check_item_data($id))
+       if (check_item_data($n))
        {
-       if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id]))
+       if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
        {
                $complete = true;
        }
@@ -277,21 +276,41 @@ if ($id != -1)
                $complete = false;
        }
 
-               $_SESSION['supp_trans']->add_grn_to_trans($id, $_POST['po_detail_item'.$id],
-                       $_POST['item_code'.$id], $_POST['item_description'.$id], $_POST['qty_recd'.$id],
-                       $_POST['prev_quantity_inv'.$id], input_num('this_quantity_inv'.$id),
-                       $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete,
-                       $_POST['std_cost_unit'.$id], "");
+               $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
+                       $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
+                       $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
+                       $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+                       $_POST['std_cost_unit'.$n], "");
        }
 }
 
+//-----------------------------------------------------------------------------------------
+
+$id = find_submit('grn_item_id');
+if ($id != -1)
+{
+       commit_item_data($id);
+}
+
+if (isset($_POST['InvGRNAll']))
+{
+       foreach($_POST as $postkey=>$postval )
+    {
+               if (strpos($postkey, "qty_recd") === 0)
+               {
+                       $id = substr($postkey, strlen("qty_recd"));
+                       $id = (int)$id;
+                       commit_item_data($id);
+               }
+    }
+}      
+
 //--------------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id != -1)
 {
        $_SESSION['supp_trans']->remove_grn_from_trans($id);
        $Ajax->activate('grn_items');
-       $Ajax->activate('grn_table');
        $Ajax->activate('inv_tot');
 }
 
@@ -339,7 +358,6 @@ $id = find_submit('grn_item_id');
 $id2 = find_submit('void_item_id');
 if ($id != -1 || $id2 != -1)
 {
-       $Ajax->activate('grn_table');
        $Ajax->activate('grn_items');
        $Ajax->activate('inv_tot');
 }