projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: removed _GET/_POST references from business logic model.
[fa-stable.git]
/
dimensions
/
includes
/
dimensions_db.inc
diff --git
a/dimensions/includes/dimensions_db.inc
b/dimensions/includes/dimensions_db.inc
index c048371042cad41d51c32a4b6ddb5cf1cdd063ee..7331cc02a0f8d4b959dc10df21b83a71a389144c 100644
(file)
--- a/
dimensions/includes/dimensions_db.inc
+++ b/
dimensions/includes/dimensions_db.inc
@@
-172,8
+172,7
@@
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
$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 = " .
- db_escape($id)." OR dimension2_id = " .db_escape($id).")";
+ 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);
$res = db_query($sql, "Sum of transactions could not be calculated");
$row = db_fetch_row($res);
@@
-182,8
+181,8
@@
function get_dimension_balance($id, $from, $to)
//--------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------
-function get_sql_for_search_dimensions($dim)
-{
+function get_sql_for_search_dimensions($dim
, $from, $to, $order='', $type = -1, $open=false, $overdue = false
)
+{
$sql = "SELECT dim.id,
dim.reference,
dim.name,
$sql = "SELECT dim.id,
dim.reference,
dim.name,
@@
-193,34
+192,30
@@
function get_sql_for_search_dimensions($dim)
dim.closed
FROM ".TB_PREF."dimensions as dim WHERE id > 0";
dim.closed
FROM ".TB_PREF."dimensions as dim WHERE id > 0";
- if (
isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != ""
)
+ if (
$order
)
{
{
- $sql .= " AND reference LIKE ".db_escape("%". $
_POST['OrderNumber']
. "%");
+ $sql .= " AND reference LIKE ".db_escape("%". $
order
. "%");
} else {
if ($dim == 1)
$sql .= " AND type_=1";
} else {
if ($dim == 1)
$sql .= " AND type_=1";
- if (isset($_POST['OpenOnly']))
- {
+ if ($open)
$sql .= " AND closed=0";
$sql .= " AND closed=0";
- }
- if (isset($_POST['type_']) && ($_POST['type_'] > 0))
- {
- $sql .= " AND type_=".db_escape($_POST['type_']);
- }
+ if ($type > 0)
+ $sql .= " AND type_=".db_escape($type);
- if (
isset($_POST['OverdueOnly'])
)
+ if (
$overdue
)
{
$today = date2sql(Today());
$sql .= " AND due_date < '$today'";
}
{
$today = date2sql(Today());
$sql .= " AND due_date < '$today'";
}
- $sql .= " AND date_ >= '" . date2sql($
_POST['FromDate']
) . "'
- AND date_ <= '" . date2sql($
_POST['ToDate']
) . "'";
+ $sql .= " AND date_ >= '" . date2sql($
from
) . "'
+ AND date_ <= '" . date2sql($
to
) . "'";
}
return $sql;
}
return $sql;
-}
+}
?>
\ No newline at end of file
?>
\ No newline at end of file