Rerun /reporting/includes/report_classes.inc

[fa-stable.git] / sales / includes / db / cust_trans_details_db.inc

diff --git a/sales/includes/db/cust_trans_details_db.inc b/sales/includes/db/cust_trans_details_db.inc
index 4300e94bed65ae836b7b7aa091b2d738e156993a..b4b9331450bf4d0f50d26992b17bc1992d519a2a 100644 (file)
--- a/sales/includes/db/cust_trans_details_db.inc
+++ b/sales/includes/db/cust_trans_details_db.inc
@@ -16,22 +16,25 @@ function get_customer_trans_details($debtor_trans_type, $debtor_trans_no)
 if (!is_array($debtor_trans_no))
        $debtor_trans_no = array( 0=>$debtor_trans_no );
 
-       $sql = "SELECT ".TB_PREF."debtor_trans_details.*,
-               ".TB_PREF."debtor_trans_details.unit_price+".TB_PREF."debtor_trans_details.unit_tax AS FullUnitPrice,
-               ".TB_PREF."debtor_trans_details.description As StockDescription,
-               ".TB_PREF."stock_master.units
-               FROM ".TB_PREF."debtor_trans_details,".TB_PREF."stock_master
+       $sql = "SELECT line.*,
+               line.unit_price+line.unit_tax AS FullUnitPrice,
+        line.unit_price AS UnitPriceExTax,  
+               line.description As StockDescription,
+               item.units, item.mb_flag
+               FROM "
+                       .TB_PREF."debtor_trans_details line,"
+                       .TB_PREF."stock_master item
                WHERE (";
 
        $tr=array();
        foreach ($debtor_trans_no as $trans_no)
-               $tr[] = 'debtor_trans_no='.$trans_no;
+               $tr[] = 'debtor_trans_no='.db_escape($trans_no);
 
        $sql .= implode(' OR ', $tr);
 
 
        $sql.=  ") AND debtor_trans_type=".db_escape($debtor_trans_type)."
-               AND ".TB_PREF."stock_master.stock_id=".TB_PREF."debtor_trans_details.stock_id
+               AND item.stock_id=line.stock_id
                ORDER BY id";
        return db_query($sql, "The debtor transaction detail could not be queried");
 }
@@ -78,4 +81,3 @@ function write_customer_trans_detail_item($debtor_trans_type, $debtor_trans_no,
        db_query($sql, "The debtor transaction detail could not be written");
 }
 
-?>
\ No newline at end of file