Dimension is missing in Supplier Invoice View GL Rows. Fixed a parameter bug in...

[fa-stable.git] / purchasing / includes / db / invoice_items_db.inc

diff --git a/purchasing/includes/db/invoice_items_db.inc b/purchasing/includes/db/invoice_items_db.inc
index e851f5734d76b4581a30674eafb269412d7915a9..a430de515f921284c231715c9c9127e6c9a6ec7a 100644 (file)
--- a/purchasing/includes/db/invoice_items_db.inc
+++ b/purchasing/includes/db/invoice_items_db.inc
@@ -12,48 +12,47 @@
 //-------------------------------------------------------------------------------------------------------------
 
 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="")
+       $gl_code, $unit_price, $unit_tax, $quantity, $grn_item_id, $po_detail_item_id, $memo_, $dim_id=0, $dim2_id=0)
 {
        $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_) ";
+               grn_item_id, po_detail_item_id, memo_, dimension_id, dimension2_id) ";
        $sql .= "VALUES (".db_escape($supp_trans_type).", ".db_escape($supp_trans_no).", "
                .db_escape($stock_id).
        ", ".db_escape($description).", ".db_escape($gl_code).", ".db_escape($unit_price)
-       .", ".db_escape($unit_tax).", ".db_escape($quantity).",
-               ".db_escape($grn_item_id).", ".db_escape($po_detail_item_id).", ".db_escape($memo_).")";
+       .", ".db_escape($unit_tax).", ".db_escape($quantity).", ".db_escape($grn_item_id)
+       .", ".db_escape($po_detail_item_id).", ".db_escape($memo_)
+       .", ".db_escape($dim_id).", ".db_escape($dim2_id).")";
 
-       if ($err_msg == "")
-               $err_msg = "Cannot insert a supplier transaction detail record";
-
-       db_query($sql, $err_msg);
+       db_query($sql, "Cannot insert a supplier transaction detail record");
 
        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_, $dim_id=0, $dim2_id=0)
 {
        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);
+               0, 0, /*$grn_item_id*/-1, /*$po_detail_item_id*/0, $memo_, $dim_id, $dim2_id);
 }
 
 
-//----------------------------------------------------------------------------------------
-
 function get_supp_invoice_items($supp_trans_type, $supp_trans_no)
 {
-       $sql = "SELECT *, unit_price AS FullUnitPrice FROM "
-               .TB_PREF."supp_invoice_items inv LEFT JOIN ".TB_PREF."grn_items grn ON grn.id =inv.grn_item_id
+       $sql = "SELECT inv.*, grn.*, unit_price AS FullUnitPrice, 
+               stock.units,
+               tax_type.exempt,
+               tax_type.name as tax_type_name
+               FROM "
+                       .TB_PREF."supp_invoice_items inv LEFT JOIN ".TB_PREF."grn_items grn ON grn.id =inv.grn_item_id
+                               LEFT JOIN ".TB_PREF."stock_master stock ON stock.stock_id=inv.stock_id
+                               LEFT JOIN ".TB_PREF."item_tax_types tax_type ON stock.tax_type_id=tax_type.id
                WHERE supp_trans_type = ".db_escape($supp_trans_type)."
-               AND supp_trans_no = ".db_escape($supp_trans_no)
-               ." ORDER BY inv.id";
+                       AND supp_trans_no = ".db_escape($supp_trans_no)
+                       ." ORDER BY inv.id";
        return db_query($sql, "Cannot retreive supplier transaction detail records");
 }
 
-//----------------------------------------------------------------------------------------
-
 function void_supp_invoice_items($type, $type_no)
 {
        $sql = "UPDATE ".TB_PREF."supp_invoice_items SET quantity=0, unit_price=0
@@ -61,4 +60,3 @@ function void_supp_invoice_items($type, $type_no)
        db_query($sql, "could not void supptrans details");
 }
 
-?>
\ No newline at end of file