Moved all SQL statements from PHP files into relevant *_db.inc files.

[fa-stable.git] / dimensions / inquiry / search_dimensions.php

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 29b58efe3f1a76a74ff3b4617587086729373050..49c2dc0b30c17e6de29a8e85459370279fc9ef54 100644 (file)
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -97,21 +97,14 @@ function view_link($row)
        return get_dimensions_trans_view_str(ST_DIMENSION, $row["id"]);
 }
 
-function is_closed($row)
+function sum_dimension($row) 
 {
-       return $row['closed'] ? _('Yes') : _('No');
+       return get_dimension_balance($row['id'], $_POST['FromDate'], $_POST['ToDate']); 
 }
 
-function sum_dimension($row) 
+function is_closed($row)
 {
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" .
-               date2sql($_POST['FromDate']) . "' AND
-               tran_date <= '" . date2sql($_POST['ToDate']) . "' AND (dimension_id = " .
-               $row['id']." OR dimension2_id = " .$row['id'].")";
-       $res = db_query($sql, "Sum of transactions could not be calculated");
-       $row = db_fetch_row($res);
-
-       return $row[0];
+       return $row['closed'] ? _('Yes') : _('No');
 }
 
 function is_overdue($row)
@@ -128,43 +121,7 @@ function edit_link($row)
                        "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT);
 }
 
-$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 (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
-{
-       $sql .= " AND reference LIKE ".db_escape("%". $_POST['OrderNumber'] . "%");
-} else {
-
-       if ($dim == 1)
-               $sql .= " AND type_=1";
-
-       if (isset($_POST['OpenOnly']))
-       {
-               $sql .= " AND closed=0";
-       }
-
-       if (isset($_POST['type_']) && ($_POST['type_'] > 0))
-       {
-               $sql .= " AND type_=".db_escape($_POST['type_']);
-       }
-
-       if (isset($_POST['OverdueOnly']))
-       {
-               $today = date2sql(Today());
-
-               $sql .= " AND due_date < '$today'";
-       }
-
-       $sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "'
-               AND date_ <= '" . date2sql($_POST['ToDate']) . "'";
-}
+$sql = get_sql_for_search_dimensions($dim);
 
 $cols = array(
        _("#") => array('fun'=>'view_link'),