Wrong Balance in Search Dimension and changing dates in view_dimension didn't work.

diff --git a/dimensions/includes/dimensions_db.inc b/dimensions/includes/dimensions_db.inc
index c048371042cad41d51c32a4b6ddb5cf1cdd063ee..3bd30f3c6642e46cef9c6d5ac3574c653f18b18a 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
-               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);
 

diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php
index 28b16de19cd9850abd059397173e7759b65aecb4..71da5b3d7fe258a72708da34d0eebbbe6b3ae653 100644 (file)
--- a/dimensions/view/view_dimension.php
+++ b/dimensions/view/view_dimension.php
@@ -83,7 +83,7 @@ if (!isset($_POST['TransToDate']))
        $_POST['TransToDate'] = Today();
 date_cells(_("from:"), 'TransFromDate');
 date_cells(_("to:"), 'TransToDate');
-submit_cells('Show',_("Show"), '', false, 'default');
+submit_cells('Show',_("Show"), '', false);
 
 end_row();