X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fincludes%2Fdimensions_db.inc;h=13c91fd41c3956ad194114d386f95cc1013b9dfa;hb=e221114b610740861dae6b7b4af5d0af28abbe21;hp=4013e4ebe070ca825faf4ad2449f5b0855416798;hpb=c1ab12ce9d688466f26ac4ca3b0e11ddc0c4b8e2;p=fa-stable.git

diff --git a/dimensions/includes/dimensions_db.inc b/dimensions/includes/dimensions_db.inc
index 4013e4eb..13c91fd4 100644
--- a/dimensions/includes/dimensions_db.inc
+++ b/dimensions/includes/dimensions_db.inc
@@ -11,20 +11,22 @@
 ***********************************************************************/
 function add_dimension($reference, $name, $type_, $date_, $due_date, $memo_)
 {
+	global $Refs;
+
 	begin_transaction();
 
 	$date = date2sql($date_);
 	$duedate = date2sql($due_date);
 
 	$sql = "INSERT INTO ".TB_PREF."dimensions (reference, name, type_, date_, due_date)
-		VALUES (".db_escape($reference).", ".db_escape($name).", $type_, '$date', '$duedate')";
+		VALUES (".db_escape($reference).", ".db_escape($name).", ".db_escape($type_)
+		.", '$date', '$duedate')";
 	db_query($sql, "could not add dimension");
-
 	$id = db_insert_id();
 
-	add_comments(systypes::dimension(), $id, $date_, $memo_);
+	add_comments(ST_DIMENSION, $id, $date_, $memo_);
 
-	references::save(systypes::dimension(), $id, $reference);
+	$Refs->save(ST_DIMENSION, $id, $reference);
 
 	commit_transaction();
 
@@ -39,14 +41,14 @@ function update_dimension($id, $name, $type_, $date_, $due_date, $memo_)
 	$duedate = date2sql($due_date);
 
 	$sql = "UPDATE ".TB_PREF."dimensions SET name=".db_escape($name).",
-		type_ = $type_,
+		type_ = ".db_escape($type_).",
 		date_='$date',
 		due_date='$duedate'
-		WHERE id = $id";
+		WHERE id = ".db_escape($id);
 
 	db_query($sql, "could not update dimension");
 
-	update_comments(systypes::dimension(), $id, null, $memo_);
+	update_comments(ST_DIMENSION, $id, null, $memo_);
 
 	commit_transaction();
 
@@ -58,10 +60,10 @@ function delete_dimension($id)
 	begin_transaction();
 
 	// delete the actual dimension
-	$sql="DELETE FROM ".TB_PREF."dimensions WHERE id=$id";
+	$sql="DELETE FROM ".TB_PREF."dimensions WHERE id=".db_escape($id);
 	db_query($sql,"The dimension could not be deleted");
 
-	delete_comments(systypes::dimension(), $id);
+	delete_comments(ST_DIMENSION, $id);
 
 	commit_transaction();
 }
@@ -70,7 +72,7 @@ function delete_dimension($id)
 
 function get_dimension($id, $allow_null=false)
 {
-    $sql = "SELECT * FROM ".TB_PREF."dimensions	WHERE id=$id";
+    $sql = "SELECT * FROM ".TB_PREF."dimensions	WHERE id=".db_escape($id);
 
 	$result = db_query($sql, "The dimension could not be retrieved");
 
@@ -120,10 +122,11 @@ function dimension_has_deposits($id)
 
 function dimension_has_payments($id)
 {
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE dimension_id = $id";
+	$sql = "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE dimension_id = ".db_escape($id)
+	 . " OR dimension2_id = ".db_escape($id);
 	$res = db_query($sql, "Transactions could not be calculated");
 	$row = db_fetch_row($res);
-	return ($row[0] != 0.0);
+	return ($row[0] > 0);
 }
 
 function dimension_is_closed($id)
@@ -136,7 +139,7 @@ function dimension_is_closed($id)
 
 function close_dimension($id)
 {
-	$sql = "UPDATE ".TB_PREF."dimensions SET closed='1' WHERE id = $id";
+	$sql = "UPDATE ".TB_PREF."dimensions SET closed='1' WHERE id = ".db_escape($id);
 	db_query($sql, "could not close dimension");
 }
 
@@ -144,8 +147,80 @@ function close_dimension($id)
 
 function reopen_dimension($id)
 {
-	$sql = "UPDATE ".TB_PREF."dimensions SET closed='0' WHERE id = $id";
-	db_query($sql, "could not close dimension");
+	$sql = "UPDATE ".TB_PREF."dimensions SET closed='0' WHERE id = ".db_escape($id);
+	db_query($sql, "could not reopen dimension");
+}
+
+//--------------------------------------------------------------------------------------
+
+function get_dimension_balance_all($id, $from, $to) 
+{
+	$from = date2sql($from);
+	$to = date2sql($to);
+	$sql = "SELECT account, coa.account_name, sum(amount) AS amt 
+		FROM "
+		.TB_PREF."gl_trans trans,"
+		.TB_PREF."chart_master coa
+		WHERE
+			trans.account = coa.account_code
+		AND	(dimension_id = ".db_escape($id)." OR dimension2_id = ".db_escape($id).")
+		AND	tran_date >= '$from' AND tran_date <= '$to' GROUP BY account";
+	return db_query($sql, "Transactions could not be calculated");
 }
 
-?>
\ No newline at end of file
+//--------------------------------------------------------------------------------------
+
+function get_dimension_balance($id, $from, $to) 
+{
+	$id = db_escape($id);
+	$sql = "SELECT SUM(amount)
+			FROM ".TB_PREF."gl_trans 
+			WHERE
+				tran_date >= '" .	date2sql($from) . "' 
+			AND	tran_date <= '" . date2sql($to) . "' 
+			AND (dimension_id = $id OR dimension2_id = $id)";
+	$res = db_query($sql, "Sum of transactions could not be calculated");
+	$row = db_fetch_row($res);
+
+	return $row[0];
+}
+
+//--------------------------------------------------------------------------------------
+
+function get_sql_for_search_dimensions($dim, $from, $to, $order='', $type = -1, $open=false, $overdue = false)
+{
+	$sql = "SELECT dim.id,
+		dim.reference,
+		dim.name,
+		dim.type_,
+		dim.date_,
+		dim.due_date,
+		dim.closed
+		FROM ".TB_PREF."dimensions as dim WHERE id > 0";
+
+	if ($order)
+	{
+		$sql .= " AND reference LIKE ".db_escape("%". $order . "%");
+	} else {
+
+		if ($dim == 1)
+			$sql .= " AND type_=1";
+
+		if ($open)
+			$sql .= " AND closed=0";
+
+		if ($type > 0)
+			$sql .= " AND type_=".db_escape($type);
+
+		if ($overdue)
+		{
+			$today = date2sql(Today());
+
+			$sql .= " AND due_date < '$today'";
+		}
+
+		$sql .= " AND date_ >= '" . date2sql($from) . "'
+			AND date_ <= '" . date2sql($to) . "'";
+	}
+	return $sql;
+}