Small adjustments and minor bugfix

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index c89bfb4d52a77f7bd513cb98a137368162eba991..bb82ccc31c80b90730de4020a0f80987e3536462 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -141,7 +141,7 @@ function invoice_totals(&$supp_trans)
        label_row(_("Invoice Total:"), $display_total, "align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'");
     else
                label_row(_("Credit Note Total"),
-                       $display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'");
+                       $display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;'");
 
     end_table();
        br(1);
@@ -464,8 +464,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 
                        if ($mode == 1)
                        {
-                               edit_button_cell("Delete" . $entered_grn->id, _("Delete"),
-                                         _('Remove item from document'));
+                               edit_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line'));
                                if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2)         
                                        label_cell("");
                        }       

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 96b5dcfe220e10557c0a2c72b6c14c0fe9f39a5c..cb737896a1c07ac85d7366e8e640c312ef5ed71e 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -269,18 +269,18 @@ if (isset($_POST['InvGRNAll']))
 
 
 //--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
-if ($id != -1)
+$id3 = find_submit('Delete');
+if ($id3 != -1)
 {
-       $_SESSION['supp_trans']->remove_grn_from_trans($id);
+       $_SESSION['supp_trans']->remove_grn_from_trans($id3);
        $Ajax->activate('grn_items');
        $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');
@@ -315,7 +315,6 @@ echo "</td></tr>";
 
 end_table(1); // outer table
 
-$id = find_submit('grn_item_id');
 if ($id != -1)
 {
        $Ajax->activate('grn_items');

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 9f2f1cc167e4b22df8071f47a09afc64ae55aaa6..5fed0495e2157dcb7e9656dedae61bce591ceeac 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -306,23 +306,53 @@ if (isset($_POST['InvGRNAll']))
 }      
 
 //--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
-if ($id != -1)
+$id3 = find_submit('Delete');
+if ($id3 != -1)
 {
-       $_SESSION['supp_trans']->remove_grn_from_trans($id);
+       $_SESSION['supp_trans']->remove_grn_from_trans($id3);
        $Ajax->activate('grn_items');
        $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');
 }
 
+$id2 = find_submit('void_item_id');
+
+if ($_SESSION["wa_current_user"]->access == 2)
+{
+       if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
+       {
+               begin_transaction();
+               
+               $myrow = get_grn_item_detail($id2);
+
+               $grn = get_grn_batch($myrow['grn_batch_id']);
+
+           $sql = "UPDATE ".TB_PREF."purch_order_details
+                       SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
+           db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
+
+           $sql = "UPDATE ".TB_PREF."grn_items
+               SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
+               db_query($sql, "The quantity invoiced off the items received record could not be updated");
+       
+               update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
+                       $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
+
+               add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
+                       -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
+                       
+               commit_transaction();
+       }               
+}
+
 start_form(false, true);
 
 start_table("$table_style2 width=98%", 8);
@@ -354,8 +384,8 @@ echo "</td></tr>";
 end_table(); // outer table
 
 //-----------------------------------------------------------------------------------------
-$id = find_submit('grn_item_id');
-$id2 = find_submit('void_item_id');
+
+
 if ($id != -1 || $id2 != -1)
 {
        $Ajax->activate('grn_items');
@@ -365,34 +395,6 @@ if ($id != -1 || $id2 != -1)
 if (get_post('AddGLCodeToTrans'))
        $Ajax->activate('inv_tot');
 
-if ($_SESSION["wa_current_user"]->access == 2)
-{
-       if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
-       {
-               begin_transaction();
-               
-               $myrow = get_grn_item_detail($id2);
-
-               $grn = get_grn_batch($myrow['grn_batch_id']);
-
-           $sql = "UPDATE ".TB_PREF."purch_order_details
-                       SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
-           db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
-
-           $sql = "UPDATE ".TB_PREF."grn_items
-               SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
-               db_query($sql, "The quantity invoiced off the items received record could not be updated");
-       
-               update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
-                       $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
-
-               add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
-                       -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
-                       
-               commit_transaction();
-       }               
-}
-
 echo "<br>";
 submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
 echo "<br>";