Minor bug in dimensions.php (Outstanding Dimensions)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d7095099182f626831b6326c5b2716a22a22a701..4757ff1c0d9d9c9fafc72ac7c72400aec980771b 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-May-2008 Joe Hunt
+# Minor bug in dimensions.php (Outstanding Dimensions)
+$ /applications/dimensions.php
+  /dimensions/inquiry/search_dimensions.php
+  
 23-May-2008 Janusz Dobrowolski
 ! Include file order / error handling order fixed once again.
 $ /includes/main.inc

diff --git a/applications/dimensions.php b/applications/dimensions.php
index 0d26953b45aac140c21a16989db921e0de79395c..3c02861ed5f92021e4acbdd39fae2b24974d2ad0 100644 (file)
--- a/applications/dimensions.php
+++ b/applications/dimensions.php
@@ -1,9 +1,9 @@
 <?php
 
        include_once("./modules/installed_modules.php");
-       class dimensions_app extends application 
+       class dimensions_app extends application
        {
-               function dimensions_app() 
+               function dimensions_app()
                {
                        global $installed_modules;
                        $dim = get_company_pref('use_dimension');
@@ -13,7 +13,7 @@
                        {
                                $this->add_module(_("Transactions"));
                                $this->add_lapp_function(0, _("Dimension Entry"),"dimensions/dimension_entry.php?");
-                               $this->add_lapp_function(0, _("Outstanding Dimensions"),"dimensions/inquiry/search_dimensions.php?OutstandingOnly=1");
+                               $this->add_lapp_function(0, _("Outstanding Dimensions"),"dimensions/inquiry/search_dimensions.php?outstanding_only=1");
 
                                $this->add_module(_("Inquiries and Reports"));
                                $this->add_lapp_function(1, _("Dimension Inquiry"),"dimensions/inquiry/search_dimensions.php?");
@@ -29,9 +29,9 @@
                                                        if ($i++ == 0)
                                                                $this->add_module(_("Maintenance"));
                                                        $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?");
-                                               }       
+                                               }
                                        }
-                               }       
+                               }
                        }
                }
        }

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 4a446c14f11f2575699efa169a16b258c8e5dca6..8b9d1b35c959d7bb1110cc404486d3ef2e975ff8 100644 (file)
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -10,15 +10,15 @@ include_once($path_to_root . "/includes/ui.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)  
+if ($use_date_picker)
        $js .= get_js_date_picker();
 
-if (isset($_GET['outstanding_only']) && $_GET['outstanding_only']) 
+if (isset($_GET['outstanding_only']) && $_GET['outstanding_only'])
 {
        $outstanding_only = 1;
-       page(_("Search Outstanding Dimensionss"), false, false, "", $js);
-} 
-else 
+       page(_("Search Outstanding Dimensions"), false, false, "", $js);
+}
+else
 {
        $outstanding_only = 0;
        page(_("Search Dimensions"), false, false, "", $js);
@@ -44,10 +44,10 @@ date_cells(_("To:"), 'ToDate');
 
 check_cells( _("Only Overdue:"), 'OverdueOnly', null);
 
-if (!$outstanding_only) 
+if (!$outstanding_only)
 {
        check_cells( _("Only Open:"), 'OpenOnly', null);
-} 
+}
 else
        $_POST['OpenOnly'] = 1;
 
@@ -64,23 +64,23 @@ $sql = "SELECT * FROM ".TB_PREF."dimensions WHERE id > 0";
 
 if ($dim == 1)
        $sql .= " AND type_=1";
-       
-if (isset($_POST['OpenOnly'])) 
+
+if (isset($_POST['OpenOnly']))
 {
        $sql .= " AND closed=0";
 }
 
-if (isset($_POST['type_']) && ($_POST['type_'] > 0)) 
+if (isset($_POST['type_']) && ($_POST['type_'] > 0))
 {
        $sql .= " AND type_=" . $_POST['type_'];
 }
 
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") 
+if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 {
        $sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'";
 }
 
-if (isset($_POST['OverdueOnly'])) 
+if (isset($_POST['OverdueOnly']))
 {
        $today = date2sql(Today());
 
@@ -94,7 +94,7 @@ $sql .= " ORDER BY due_date";
 
 $result = db_query($sql,"could not query dimensions");
 
-start_table("$table_style width=80%"); 
+start_table("$table_style width=80%");
 
 if (!$outstanding_only)
        $th = array(_("#"), _("Reference"), _("Name"), _("Type"), _("Date"),
@@ -106,28 +106,28 @@ table_header($th);
 $j = 1;
 $k = 0;
 
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" . 
-               date2sql($_POST['FromDate']) . "' AND 
-               tran_date <= '" . date2sql($_POST['ToDate']) . "' AND dimension_id = " . 
+       $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" .
+               date2sql($_POST['FromDate']) . "' AND
+               tran_date <= '" . date2sql($_POST['ToDate']) . "' AND dimension_id = " .
                $myrow['id'];
        $res = db_query($sql, "Transactions could not be calculated");
        $row = db_fetch_row($res);
-               
+
        if ($k == 1)
        {
                $row_text = "class='oddrow'";
                $k = 0;
-       } 
-       else 
+       }
+       else
        {
                $row_text = "class='evenrow'";
                $k++;
        }
 
        // check if it's an overdue work order
-       if (date_diff(Today(), sql2date($myrow["due_date"]), "d") > 0) 
+       if (date_diff(Today(), sql2date($myrow["due_date"]), "d") > 0)
        {
                $row_text = "class='overduebg'";
        }
@@ -145,7 +145,7 @@ while ($myrow = db_fetch($result))
        if (!$outstanding_only)
                label_cell(($myrow["closed"] ? _("Yes") : _("No")));
        amount_cell($row[0]);
-       if ($myrow["closed"] == 0) 
+       if ($myrow["closed"] == 0)
                label_cell("<a href='$mpage'>" . _("Edit") . "</a>");
        end_row();