Merged all main trunk bugfixes up to release 2.0.5

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index e7ddde0752131a789dd7cef8ef0d92d660f10f8e..3854b5ae0ad14dde15840463e23d686c0c8bcb5b 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -80,7 +80,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');
 }
 //------------------------------------------------------------------------------------------------
@@ -232,44 +232,56 @@ 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))
        {
                $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_QuantityCredited'],
-       //      $_POST['order_price'], $_POST['ChgPrice'], $complete,
-       //      $_POST['std_cost_unit'], $_POST['gl_code']);
-               $_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_QuantityCredited'.$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_QuantityCredited'.$n),
+               $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+               $_POST['std_cost_unit'.$n], "");
        }
 }
 
-//--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
+//-----------------------------------------------------------------------------------------
+
+$id = find_submit('grn_item_id');
 if ($id != -1)
 {
-       $_SESSION['supp_trans']->remove_grn_from_trans($id);
+       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);
+               }
+    }
+}      
+
+
+//--------------------------------------------------------------------------------------------------
+$id3 = find_submit('Delete');
+if ($id3 != -1)
+{
+       $_SESSION['supp_trans']->remove_grn_from_trans($id3);
        $Ajax->activate('grn_items');
-       $Ajax->activate('grn_table');
        $Ajax->activate('inv_tot');
 }
 
-$id = find_submit('Delete2');
-if ($id != -1)
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
 {
-       $_SESSION['supp_trans']->remove_gl_codes_from_trans($id);
+       $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
        clear_fields();
        $Ajax->activate('gl_items');
        $Ajax->activate('inv_tot');
@@ -304,10 +316,8 @@ echo "</td></tr>";
 
 end_table(1); // outer table
 
-$id = find_submit('grn_item_id');
 if ($id != -1)
 {
-       $Ajax->activate('grn_table');
        $Ajax->activate('grn_items');
        $Ajax->activate('inv_tot');
 }