Old hooks superseded by new hooks API.

[fa-stable.git] / sales / includes / sales_db.inc

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 4dff712f2ae1b2c729b8099f5294670d3ce3776d..db81a3e73ee3a532ba2f761aaf534dfb00da9188 100644 (file)
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -174,7 +174,7 @@ function get_kit_price($item_code, $currency, $sales_type_id, $factor=null,
                $kit_price = get_price( $item_code, $currency, $sales_type_id, 
                        $factor, $date);
 
-               if ($kit_price !== false) {
+               if ($kit_price !== 0) {
                        return $kit_price;
                }
        }       
@@ -300,7 +300,8 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
                                        $myrow["stock_id"],$myrow["quantity"],
                                        $myrow["unit_price"], $myrow["discount_percent"],
                                        $myrow["qty_done"], $myrow["standard_cost"],
-                                       $myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"]);
+                                       $myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"],
+                                       @$myrow["src_id"]);
                        }
                }
        } // !newdoc
@@ -316,10 +317,13 @@ function get_sales_child_lines($trans_type, $trans_no, $lines=true)
        if (!is_array($trans_no)) {
                $trans_no = array($trans_no);
        }
-       
+
        $par_tbl = $trans_type == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details";
        $par_no = $trans_type == ST_SALESORDER ? "trans.order_no" : "trans.debtor_trans_no";
 
+       foreach($trans_no as $n => $trans) {
+               $trans_no[$n] = db_escape($trans);
+       }
        $sql = "SELECT child.*
                        FROM
                                ".TB_PREF."debtor_trans_details child
@@ -360,7 +364,8 @@ function get_sales_parent_lines($trans_type, $trans_no, $lines=true)
                        LEFT JOIN ".TB_PREF."debtor_trans_details trans 
                                ON trans.src_id=parent.id
                        WHERE
-                               trans.debtor_trans_type=$trans_type AND trans.debtor_trans_no=$trans_no";
+                               trans.debtor_trans_type=".db_escape($trans_type)
+                               ." AND trans.debtor_trans_no=".db_escape($trans_no);
        if (!$lines)
                $sql .= " GROUP BY $par_no";