X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fdimension_entry.php;h=7b9bcb3791ceb475581dc3a87287c7ed71b480c8;hb=36ec54507b7841b2352734b81e45b95e371ecdab;hp=6474ac1482aee51cbc82cc30d4c67b189d060a4d;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php
index 6474ac14..7b9bcb37 100644
--- a/dimensions/dimension_entry.php
+++ b/dimensions/dimension_entry.php
@@ -1,12 +1,18 @@
 <?php
-
-
-$page_security = 10;
-$path_to_root="..";
+/**********************************************************************
+    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 = 'SA_DIMENSION';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Dimension Entry"));
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -14,6 +20,11 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/dimensions/includes/dimensions_db.inc");
 include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
 
+$js = "";
+if ($use_date_picker)
+	$js .= get_js_date_picker();
+page(_("Dimension Entry"), false, false, "", $js);
+
 //---------------------------------------------------------------------------------------
 
 if (isset($_GET['trans_no']))
@@ -67,40 +78,49 @@ if (isset($_GET['ClosedID']))
 	safe_exit();
 }
 
+//---------------------------------------------------------------------------------------
+
+if (isset($_GET['ReopenedID'])) 
+{
+	$id = $_GET['ReopenedID'];
+
+	display_notification_centered(_("The dimension has been re-opened. ") . " #$id");
+	safe_exit();
+}
+
 //-------------------------------------------------------------------------------------------------
 
 function safe_exit()
 {
 	global $path_to_root;
 
-	hyperlink_no_params("", _("Enter a new dimension"));
+	hyperlink_no_params("", _("Enter a &new dimension"));
 	echo "<br>";
-	hyperlink_no_params($path_to_root . "/dimensions/inquiry/search_dimensions.php", _("Select an existing dimension"));
-	echo "<br><br>";
-
-	end_page();
+	hyperlink_no_params($path_to_root . "/dimensions/inquiry/search_dimensions.php", _("&Select an existing dimension"));
 
-	exit;
+	display_footer_exit();
 }
 
 //-------------------------------------------------------------------------------------
 
 function can_process()
 {
-	global $selected_id;
+	global $selected_id, $Refs;
 
 	if ($selected_id == -1) 
 	{
 
-    	if (!references::is_valid($_POST['ref'])) 
+    	if (!$Refs->is_valid($_POST['ref'])) 
     	{
     		display_error( _("The dimension reference must be entered."));
+			set_focus('ref');
     		return false;
     	}
 
-    	if (!is_new_reference($_POST['ref'], systypes::dimension())) 
+    	if (!is_new_reference($_POST['ref'], ST_DIMENSION)) 
     	{
     		display_error(_("The entered reference is already in use."));
+			set_focus('ref');
     		return false;
     	}
 	}
@@ -108,18 +128,21 @@ function can_process()
 	if (strlen($_POST['name']) == 0) 
 	{
 		display_error( _("The dimension name must be entered."));
+		set_focus('name');
 		return false;
 	}
 
 	if (!is_date($_POST['date_']))
 	{
 		display_error( _("The date entered is in an invalid format."));
+		set_focus('date_');
 		return false;
 	}
 
 	if (!is_date($_POST['due_date']))
 	{
 		display_error( _("The required by date entered is in an invalid format."));
+		set_focus('due_date');
 		return false;
 	}
 
@@ -162,6 +185,7 @@ if (isset($_POST['delete']))
 	if (dimension_has_payments($selected_id) || dimension_has_deposits($selected_id))
 	{
 		display_error(_("This dimension cannot be deleted because it has already been processed."));
+		set_focus('ref');
 		$cancel_delete = true;
 	}
 
@@ -184,6 +208,13 @@ if (isset($_POST['close']))
 	meta_forward($_SERVER['PHP_SELF'], "ClosedID=$selected_id");
 }
 
+if (isset($_POST['reopen'])) 
+{
+
+	// update the closed flag
+	reopen_dimension($selected_id);
+	meta_forward($_SERVER['PHP_SELF'], "ReopenedID=$selected_id");
+}
 //-------------------------------------------------------------------------------------
 
 start_form();
@@ -197,15 +228,15 @@ if ($selected_id != -1)
 	if (strlen($myrow[0]) == 0) 
 	{
 		display_error(_("The dimension sent is not valid."));
-		exit;
+		display_footer_exit();
 	}
 
 	// if it's a closed dimension can't edit it
-	if ($myrow["closed"] == 1) 
-	{
-		display_error(_("This dimension is closed and cannot be edited."));
-		exit;
-	}
+	//if ($myrow["closed"] == 1) 
+	//{
+	//	display_error(_("This dimension is closed and cannot be edited."));
+	//	display_footer_exit();
+	//}
 
 	$_POST['ref'] = $myrow["reference"];
 	$_POST['closed'] = $myrow["closed"];
@@ -213,7 +244,7 @@ if ($selected_id != -1)
 	$_POST['type_'] = $myrow["type_"];
 	$_POST['date_'] = sql2date($myrow["date_"]);
 	$_POST['due_date'] = sql2date($myrow["due_date"]);
-	$_POST['memo_'] = get_comments_string(systypes::dimension(), $selected_id);
+	$_POST['memo_'] = get_comments_string(ST_DIMENSION, $selected_id);
 
 	hidden('ref', $_POST['ref']);
 
@@ -223,7 +254,7 @@ if ($selected_id != -1)
 } 
 else 
 {
-	ref_row(_("Dimension Reference:"), 'ref', references::get_next(systypes::dimension()));
+	ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION));
 }
 
 text_row_ex(_("Name") . ":", 'name', 50, 75);
@@ -234,22 +265,29 @@ number_list_row(_("Type"), 'type_', null, 1, $dim);
 
 date_row(_("Start Date") . ":", 'date_');
 
-date_row(_("Date Required By") . ":", 'due_date', null, sys_prefs::default_dimension_required_by());
+date_row(_("Date Required By") . ":", 'due_date', '', null, $SysPrefs->default_dimension_required_by());
 
 textarea_row(_("Memo:"), 'memo_', null, 40, 5);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1);
+if (isset($_POST['closed']) && $_POST['closed'] == 1)
+	display_note(_("This Dimension is closed."), 0, 0, "class='currentfg'");
 
 if ($selected_id != -1) 
 {
 	echo "<br>";
-
-	submit_center_first('close', _("Close This Dimension"));
-	submit_center_last('delete', _("Delete This Dimension"));
+	submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), 'default');
+	if ($_POST['closed'] == 1)
+		submit('reopen', _("Re-open This Dimension"), true, _('Mark this dimension as re-opened'), true);
+	else	
+		submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true);
+	submit_center_last('delete', _("Delete This Dimension"), _('Delete unused dimension'), true);
+}
+else
+{
+	submit_center('ADD_ITEM', _("Add"), true, '', 'default');
 }
-
 end_form();
 
 //--------------------------------------------------------------------------------------------