Global change in naming convention from std_cost to unit_cost.

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

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 465002303887c7ca2659ea5ec8aa9b34865e360c..d1cabba5ccf83fd32f19895ad2212f4cbadbb7e6 100644 (file)
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -231,7 +231,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
        } else {
                // read header data from first document
                $myrow = get_customer_trans($trans_no[0],$doc_type);
-               if (count($trans_no)>1)
+               if (count_array($trans_no)>1)
                        $cart->trans_no = get_customer_trans_version($doc_type, $trans_no);
                else
                        $cart->trans_no = array($trans_no[0]=>$myrow["version"]);
@@ -274,7 +274,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
                                $cart->line_items[$line_no] = new line_details(
                                        $myrow["stock_id"],$myrow["quantity"],
                                        $myrow["unit_price"], $myrow["discount_percent"],
-                                       $myrow["qty_done"], $myrow["standard_cost"],
+                                       $myrow["qty_done"], $myrow["unit_cost"],
                                        $myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"],
                                        @$myrow["src_id"]);
                        }
@@ -368,10 +368,10 @@ function get_sales_child_documents($trans_type, $trans_no)
        // FIXME -  credit notes retrieved here should be those linked to invoices containing 
        // at least one line from related invoice
 
-       if (!count($trans_no))
+       if (!count_array($trans_no))
                return false;
        $childs = get_sales_child_numbers($trans_type, $trans_no, false);
-       if (!count($childs))
+       if (!count_array($childs))
                return false;
                
        $sql = "SELECT * FROM ".TB_PREF."debtor_trans