Moved all SQL statements from PHP files into relevant *_db.inc files.

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

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 3440678189c5c6a8f76c1007840e1851d0f76bb6..6b24fe279700c587cfd3031cb5a1666ee0ad85d6 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -99,8 +99,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
        $Ajax->activate('gl_items');
        $input_error = false;
 
-       $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($_POST['gl_code']);
-       $result = db_query($sql,"get account information");
+       $result = get_gl_account_info($_POST['gl_code']);
        if (db_num_rows($result) == 0)
        {
                display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
@@ -186,15 +185,7 @@ function check_data()
                return false;
        }
 
-       $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id="
-               .db_escape($_SESSION['supp_trans']->supplier_id) . " AND supp_reference=" 
-               .db_escape( $_POST['supp_reference']) 
-               . " AND ov_amount!=0"; // ignore voided invoice references
-
-       $result=db_query($sql,"The sql to check for the previous entry of the same invoice failed");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] == 1)
+       if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
        {       /*Transaction reference already entered */
                display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")"));
                return false;
@@ -342,27 +333,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
        $id2 = find_submit('void_item_id');
        if ($id2 != -1) 
        {
-               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(ST_SUPPRECEIVE, $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();
+               remove_not_invoice_item($id2);
                display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
 
        }