X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=f091a3539634dffd817502730072b060c43f78a4;hb=fe053abb14541530e5dc0fe821cbe6edfcde8a6f;hp=7f8b5e21cfb5eef85ab14eb5f663b7d1eb5a074f;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 7f8b5e21..f091a353 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -17,6 +17,8 @@ include_once($path_to_root . "/sales/includes/db/sales_invoice_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_delivery_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_points_db.inc");
+include_once($path_to_root . "/sales/includes/db/sales_groups_db.inc");
+include_once($path_to_root . "/sales/includes/db/recurrent_invoices_db.inc");
 include_once($path_to_root . "/sales/includes/db/custalloc_db.inc");
 include_once($path_to_root . "/sales/includes/db/cust_trans_db.inc");
 include_once($path_to_root . "/sales/includes/db/cust_trans_details_db.inc");
@@ -92,15 +94,15 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 		$myrow = get_sales_type($sales_type_id);
 		$factor = $myrow['factor'];
 	}
-	    
+
 	$add_pct = get_company_pref('add_pct');
 	$base_id = get_base_sales_type();
     $home_curr = get_company_currency();
 	//	AND (sales_type_id = $sales_type_id	OR sales_type_id = $base_id)
 	$sql = "SELECT price, curr_abrev, sales_type_id
 		FROM ".TB_PREF."prices
-		WHERE stock_id = '$stock_id' 
-			AND (curr_abrev = '$currency' OR curr_abrev = '$home_curr')";
+		WHERE stock_id = ".db_escape($stock_id)."
+			AND (curr_abrev = ".db_escape($currency)." OR curr_abrev = ".db_escape($home_curr).")";
 
 	$result = db_query($sql, "There was a problem retrieving the pricing information for the part $stock_id for customer");
 	$num_rows = db_num_rows($result);
@@ -113,6 +115,23 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	    $prices[$myrow['sales_type_id']][$myrow['curr_abrev']] = $myrow['price'];
 	}
 	$price = false;
+	if (isset($prices[$sales_type_id][$currency])) 
+	{
+	    $price = $prices[$sales_type_id][$currency];
+	}
+	elseif (isset($prices[$base_id][$currency])) 
+	{
+	    $price = $prices[$base_id][$currency] * $factor;
+	}
+	elseif (isset($prices[$sales_type_id][$home_curr])) 
+	{
+	    $price = $prices[$sales_type_id][$home_curr] / $rate;
+	}
+	elseif (isset($prices[$base_id][$home_curr])) 
+	{
+	    $price = $prices[$base_id][$home_curr] * $factor / $rate;
+	}
+/*
 	if (isset($prices[$sales_type_id][$home_curr])) 
 	{
 	    $price = $prices[$sales_type_id][$home_curr] / $rate;
@@ -125,6 +144,7 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu
 	{
 	    $price = $prices[$base_id][$home_curr] * $factor / $rate;
 	}
+*/	
 	elseif ($num_rows == 0 && $add_pct != -1)
 	{
 		$price = get_calculated_price($stock_id, $add_pct);
@@ -176,56 +196,8 @@ function get_kit_price($item_code, $currency, $sales_type_id, $factor=null,
 	return $kit_price;
 }
 
-//-----------------------------------------------------------------------------
-
-function set_document_parent($cart)
-{
-	$inv_no = key($cart->trans_no);
-
-	if (count($cart->src_docs) == 1) {
-
-	// if this child document has only one parent - update child link
-	$del_no = reset(array_keys($cart->src_docs));
-
-	$sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $del_no .
-		' WHERE type='.$cart->trans_type.' AND trans_no='. $inv_no ;
-	db_query($sql, 'Child document link cannot be updated');
-
-	}
-	if ($cart->trans_type != 10)
-		return 0;
-
-	// the rest is batch invoice specific
-
-	foreach ($cart->line_items as $line) {
-		if ($line->quantity != $line->qty_dispatched) {
-			return 1;	// this is partial invoice
-		}
-	}
-
-	$sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $inv_no .
-	' WHERE type='.get_parent_type($cart->trans_type).' AND (';
-
-	$deliveries = array_keys($cart->src_docs);
-
-	foreach ($deliveries as $key=>$del)
-		$deliveries[$key] = 'trans_no='.$del;
-
-	$sql .= implode(' OR ', $deliveries) . ')';
-	db_query($sql, 'Delivery links cannot be updated');
-
-	return 0; // batch or complete invoice
-}
-
 //--------------------------------------------------------------------------------------------------
-function get_parent_type($type)
-{
-	$parent_types = array( 11=>10, 10=>13, 13=>30 );
-	return isset($parent_types[$type]) ?  $parent_types[$type] : 0;
-}
-
-//--------------------------------------------------------------------------------------------------
-function update_parent_line($doc_type, $line_id, $qty_dispatched)
+function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false)
 {
 	$doc_type = get_parent_type($doc_type);
 
@@ -233,14 +205,18 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched)
 	if ($doc_type==0)
 		return false;
 	else {
-		if ($doc_type==30)
+		if ($doc_type==ST_SALESORDER)
+		{
 			$sql = "UPDATE ".TB_PREF."sales_order_details
-				SET qty_sent = qty_sent + $qty_dispatched
-				WHERE id=$line_id";
+				SET qty_sent = qty_sent + $qty_dispatched";
+			if ($auto)
+				$sql .= ", quantity = quantity + $qty_dispatched";
+			$sql .= " WHERE id=".db_escape($line_id);
+		}		
 		else
 			$sql = "UPDATE ".TB_PREF."debtor_trans_details
 				SET qty_done = qty_done + $qty_dispatched
-				WHERE id=$line_id";
+				WHERE id=".db_escape($line_id);
 	}
 	db_query($sql, "The parent document detail record could not be updated");
 	return true;
@@ -253,7 +229,7 @@ function get_location(&$cart)
 {
 	$sql = "SELECT ".TB_PREF."locations.* FROM ".TB_PREF."stock_moves,"
 		.TB_PREF."locations".
-		" WHERE type=".$cart->trans_type.
+		" 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";
@@ -289,10 +265,10 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
 		$cart->set_sales_type($myrow["tpe"], $myrow["sales_type"], $myrow["tax_included"],0);
 
 		$cart->set_customer($myrow["debtor_no"], $myrow["DebtorName"],
-			$myrow["curr_code"], $myrow["discount"]);
+			$myrow["curr_code"], $myrow["discount"], $myrow["payment_terms"]);
 
 		$cart->set_branch($myrow["branch_code"], $myrow["tax_group_id"],
-			$myrow["tax_group_name"],	$myrow["phone"], $myrow["email"]);
+			$myrow["tax_group_name"]);
 
 		$cart->reference = $myrow["reference"];
 		$cart->order_no = $myrow["order_"];
@@ -333,4 +309,99 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
 	return true;
 }
 //----------------------------------------------------------------------------------------
+
+function get_sales_child_lines($trans_type, $trans_no, $lines=true)
+{
+	if (!($ctype = get_child_type($trans_type)))
+		return false;
+	if (!is_array($trans_no)) {
+		$trans_no = array($trans_no);
+	}
+	
+	$trtbl = $trans_type == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details";
+	
+	$rel = $trans_type == ST_SALESORDER ? "trans.trans_type=$trans_type"
+		. " AND trans.order_no IN(". implode(',', array_values($trans_no)).")"
+		: "child.debtor_trans_type=$ctype"
+		. " AND trans.debtor_trans_no IN(". implode(',', array_values($trans_no)).")";
+
+	$sql = "SELECT child.*
+			FROM
+				".TB_PREF."debtor_trans_details child,
+				".TB_PREF."$trtbl trans
+			WHERE
+				$rel AND trans.id=child.src_id";
+
+	if (!$lines)
+		$sql .= " GROUP BY child.debtor_trans_no";
+
+	$sql .= " ORDER BY child.debtor_trans_no";
+
+	return db_query($sql, "can't retrieve child trans");
+}
+
+function get_sales_child_numbers($trans_type, $trans_no)
+{
+	$trans = array();
+	$res = get_sales_child_lines($trans_type, $trans_no, false);
+	while ($line = db_fetch($res)) {
+		$trans[] = $line['debtor_trans_no'];
+	}
+	return $trans;
+}
+
+function get_sales_parent_lines($trans_type, $trans_no, $lines=true)
+{
+	$partype = get_parent_type($trans_type);
+
+	if (!$partype)
+		return false;
+
+	$partbl = $partype == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details";
+	$parent_no = $partype == ST_SALESORDER ? "parent.order_no" : "parent.debtor_trans_no";
+	$sql = "SELECT parent.*
+			FROM
+				".TB_PREF."$partbl parent
+			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";
+	if (!$lines)
+		$sql .= " GROUP BY $parent_no";
+	
+	$sql .= " ORDER BY $parent_no";
+	
+	return db_query($sql, "can't retrieve child trans");
+
+}
+
+function get_sales_parent_numbers($trans_type, $trans_no)
+{
+	$trans = array();
+	$res = get_sales_parent_lines($trans_type, $trans_no, false);
+	while ($line = db_fetch($res))
+		$trans[] = $line[$trans_type==ST_CUSTDELIVERY ? 'order_no' : 'debtor_trans_no'];
+	return $trans;
+}
+
+//----------------------------------------------------------------------------------------
+
+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))
+		return false;
+	$childs = get_sales_child_numbers($trans_type, $trans_no, false);
+	if (!count($childs))
+		return false;
+		
+	$sql = "SELECT * FROM ".TB_PREF."debtor_trans
+		WHERE type=".get_child_type($trans_type)." AND trans_no IN(". implode(',', array_values($childs)).")";
+
+	return db_query($sql,"The related credit notes could not be retreived");
+}
+
+
 ?>
\ No newline at end of file