X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=b7e168320d2e63af6c56bd993982746e917bfb3e;hb=80061be53f5f8d6415801e6e411a3891efc128c4;hp=d5c0e487d2ba9a9203c9b4313bc7e92909f07bff;hpb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;p=fa-stable.git

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index d5c0e487..b7e16832 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -47,7 +47,7 @@ function add_gl_trans_customer($type, $type_no, $date_, $account, $dimension, $d
 
 function get_calculated_price($stock_id, $add_pct)
 {
-	$avg = get_standard_cost($stock_id);
+	$avg = get_unit_cost($stock_id);
 	if ($avg == 0)
 		return 0;
 	return round2($avg * (1 + $add_pct / 100), user_price_dec());
@@ -200,14 +200,15 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false)
 //
 function get_location(&$cart)
 {
-	$sql = "SELECT ".TB_PREF."locations.* FROM ".TB_PREF."stock_moves,"
-		.TB_PREF."locations".
+	$sql = "SELECT location.*
+		FROM ".TB_PREF."stock_moves move,"
+			.TB_PREF."locations location".
 		" WHERE type=".db_escape($cart->trans_type).
 		" AND trans_no=".key($cart->trans_no).
 		" AND qty!=0 ".
-		" AND ".TB_PREF."locations.loc_code=".TB_PREF."stock_moves.loc_code";
-	$result = db_query($sql, 'Retreiving inventory location');
+		" AND location.loc_code=move.loc_code";
 
+	$result = db_query($sql, 'Retreiving inventory location');
 
 	if (db_num_rows($result)) {
 		return db_fetch($result);
@@ -230,14 +231,15 @@ 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)
+        $debtor_no = $myrow['debtor_no'];
+		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"]);
 
 		$cart->set_sales_type($myrow["tpe"], $myrow["sales_type"], $myrow["tax_included"],0);
 
-		$cart->set_customer($myrow["debtor_no"], $myrow["DebtorName"],
+        $cart->set_customer($debtor_no, $myrow["DebtorName"],
 			$myrow["curr_code"], $myrow["discount"], $myrow["payment_terms"]);
 
 		$cart->set_branch($myrow["branch_code"], $myrow["tax_group_id"],
@@ -278,7 +280,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
 					@$myrow["src_id"]);
 			}
 		}
-		$cart->prepayments = get_payments_for($trans_no, $doc_type);
+        $cart->prepayments = get_payments_for($trans_no[0], $doc_type, $debtor_no);
 
 	} // !newdoc
 
@@ -367,10 +369,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