Fixed bugs 312-314, imporved debug error handling, updated gettext template.

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

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 260ba9b10b961c27c5740ccb74fb1d663bd847a6..5e6913d16b730795459d21f9d3c706ff68e9767b 100644 (file)
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -201,6 +201,8 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false)
 {
        $doc_type = get_parent_type($doc_type);
 
+        $qty_dispatched = (float)$qty_dispatched;
+
 //     echo "update line: $line_id, $doc_type, $qty_dispatched";
        if ($doc_type==0)
                return false;
@@ -317,10 +319,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
@@ -361,7 +366,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";