X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_items_db.inc;h=621309bb0464dcb21bd2d1171c008d3e784fc53e;hb=e28f3fe01f168d761393ce2f10409284eef2adb4;hp=e072e6f68847778055998dd49d036cf53edc67a2;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_items_db.inc b/purchasing/includes/db/invoice_items_db.inc index e072e6f6..621309bb 100644 --- a/purchasing/includes/db/invoice_items_db.inc +++ b/purchasing/includes/db/invoice_items_db.inc @@ -2,40 +2,41 @@ //------------------------------------------------------------------------------------------------------------- -function add_supp_invoice_item($supp_trans_type, $supp_trans_no, $stock_id, $description, - $gl_code, $unit_price, $unit_tax, $quantity, $grn_item_id, $po_detail_item_id, $memo_, - $err_msg="") +function add_supp_invoice_item($supp_trans_type, $supp_trans_no, $stock_id, $description, + $gl_code, $unit_price, $unit_tax, $quantity, $grn_item_id, $po_detail_item_id, $memo_, + $err_msg="") { $sql = "INSERT INTO ".TB_PREF."supp_invoice_items (supp_trans_type, supp_trans_no, stock_id, description, gl_code, unit_price, unit_tax, quantity, grn_item_id, po_detail_item_id, memo_) "; - $sql .= "VALUES ($supp_trans_type, $supp_trans_no, '$stock_id', '$description', $gl_code, $unit_price, $unit_tax, $quantity, - $grn_item_id, $po_detail_item_id, '$memo_')"; - + $sql .= "VALUES ($supp_trans_type, $supp_trans_no, ".db_escape($stock_id). + ", ".db_escape($description).", ".db_escape($gl_code).", $unit_price, $unit_tax, $quantity, + $grn_item_id, $po_detail_item_id, ".db_escape($memo_).")"; + if ($err_msg == "") $err_msg = "Cannot insert a supplier transaction detail record"; - - db_query($sql, $err_msg); - return db_insert_id(); + db_query($sql, $err_msg); + + return db_insert_id(); } //------------------------------------------------------------------------------------------------------------- -function add_supp_invoice_gl_item($supp_trans_type, $supp_trans_no, $gl_code, $amount, $memo_, $err_msg="") +function add_supp_invoice_gl_item($supp_trans_type, $supp_trans_no, $gl_code, $amount, $memo_, $err_msg="") { - return add_supp_invoice_item($supp_trans_type, $supp_trans_no, "", "", $gl_code, $amount, - 0, 0, /*$grn_item_id*/0, /*$po_detail_item_id*/0, $memo_, $err_msg); -} + return add_supp_invoice_item($supp_trans_type, $supp_trans_no, "", "", $gl_code, $amount, + 0, 0, /*$grn_item_id*/0, /*$po_detail_item_id*/0, $memo_, $err_msg); +} //---------------------------------------------------------------------------------------- function get_supp_invoice_items($supp_trans_type, $supp_trans_no) { - $sql = "SELECT *,unit_price+unit_tax AS FullUnitPrice FROM ".TB_PREF."supp_invoice_items - WHERE supp_trans_type = $supp_trans_type + $sql = "SELECT *, unit_price AS FullUnitPrice FROM ".TB_PREF."supp_invoice_items + WHERE supp_trans_type = $supp_trans_type AND supp_trans_no = $supp_trans_no ORDER BY id"; - return db_query($sql, "Cannot retreive supplier transaction detail records"); + return db_query($sql, "Cannot retreive supplier transaction detail records"); } //---------------------------------------------------------------------------------------- @@ -44,7 +45,7 @@ function void_supp_invoice_items($type, $type_no) { $sql = "UPDATE ".TB_PREF."supp_invoice_items SET quantity=0, unit_price=0 WHERE supp_trans_type = $type AND supp_trans_no=$type_no"; - db_query($sql, "could not void supptrans details"); + db_query($sql, "could not void supptrans details"); } //---------------------------------------------------------------------------------------- @@ -54,8 +55,8 @@ function add_supp_invoice_tax_item($supp_trans_type, $supp_trans_no, $tax_type_i { $sql = "INSERT INTO ".TB_PREF."supp_invoice_tax_items (supp_trans_type, supp_trans_no, tax_type_id, rate, included_in_price, amount) VALUES ($supp_trans_type, $supp_trans_no, $tax_type_id, $rate, $included_in_price, $amount)"; - - db_query($sql, "The supplier transaction tax detail could not be added"); + + db_query($sql, "The supplier transaction tax detail could not be added"); } //---------------------------------------------------------------------------------------- @@ -63,9 +64,9 @@ function add_supp_invoice_tax_item($supp_trans_type, $supp_trans_no, $tax_type_i function get_supp_invoice_tax_items($supp_trans_type, $supp_trans_no) { $sql = "SELECT ".TB_PREF."supp_invoice_tax_items.*, ".TB_PREF."tax_types.name AS tax_type_name - FROM ".TB_PREF."supp_invoice_tax_items,".TB_PREF."tax_types - WHERE supp_trans_type = $supp_trans_type - AND supp_trans_no = $supp_trans_no + FROM ".TB_PREF."supp_invoice_tax_items,".TB_PREF."tax_types + WHERE supp_trans_type = $supp_trans_type + AND supp_trans_no = $supp_trans_no AND ".TB_PREF."tax_types.id = ".TB_PREF."supp_invoice_tax_items.tax_type_id"; return db_query($sql, "The supplier transaction tax details could not be queried"); @@ -76,9 +77,9 @@ function get_supp_invoice_tax_items($supp_trans_type, $supp_trans_no) function void_supp_invoice_tax_items($type, $type_no) { $sql = "UPDATE ".TB_PREF."supp_invoice_tax_items SET amount=0 - WHERE supp_trans_type = $type + WHERE supp_trans_type = $type AND supp_trans_no=$type_no"; - + db_query($sql, "The supplier transaction tax details could not be voided"); }