Merging version 2.1 RC to main trunk.

[fa-stable.git] / dimensions / view / view_dimension.php

diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php
index 843da185a24a2b0e37231889b72d4b236e5cdf74..a8ad64d1bae66a9e752bda9c37b548352206cfa3 100644 (file)
--- a/dimensions/view/view_dimension.php
+++ b/dimensions/view/view_dimension.php
@@ -1,13 +1,22 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="../..";
 
 include_once($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
-       $js .= get_js_open_window(800, 500);
+if ($use_date_picker)
+       $js .= get_js_date_picker();
 page(_("View Dimension"), true, false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -18,11 +27,17 @@ include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
 
 //-------------------------------------------------------------------------------------------------
 
-if ($_GET['trans_no'] != "")
+if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 {
        $id = $_GET['trans_no'];
 }
 
+if (isset($_POST['Show']))
+{
+       $id = $_POST['trans_no'];
+}
+
+
 display_heading(systypes::name(systypes::dimension()) . " # " . $id);
 
 br(1);
@@ -30,7 +45,7 @@ $myrow = get_dimension($id);
 
 if (strlen($myrow[0]) == 0)
 {
-       echo _("The work order number sent is not valid.");
+       echo _("The dimension number sent is not valid.");
     exit;
 }
 
@@ -57,7 +72,26 @@ if ($myrow["closed"] == true)
        display_note(_("This dimension is closed."));
 }
 
-display_dimension_payments($id);
+start_form();
+
+start_table("class='tablestyle_noborder'");
+start_row();
+
+if (!isset($_POST['TransFromDate']))
+       $_POST['TransFromDate'] = begin_fiscalyear();
+if (!isset($_POST['TransToDate']))
+       $_POST['TransToDate'] = Today();
+date_cells(_("from:"), 'TransFromDate');
+date_cells(_("to:"), 'TransToDate');
+submit_cells('Show',_("Show"));
+
+end_row();
+
+end_table();
+hidden('trans_no', $id);
+end_form();
+
+display_dimension_balance($id, $_POST['TransFromDate'], $_POST['TransToDate']);
 
 br(1);