X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=dimensions%2Fdimension_entry.php;h=98c1d120974f9a2b4d41faa21bff1e69b2eb685d;hb=95f98ed74ac6379b95e2ceb1eb0c9bbcd36fd4a9;hp=5a5a88256310cef65490e3a80a70e07817b641b7;hpb=c1262f2b7a89cd7ce322b2b738250958881d0db3;p=fa-stable.git diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index 5a5a8825..98c1d120 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -14,7 +14,6 @@ $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); 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"); include_once($path_to_root . "/admin/db/tags_db.inc"); @@ -22,9 +21,9 @@ 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) +if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_("Dimension Entry"), false, false, "", $js); +page(_($help_context = "Dimension Entry"), false, false, "", $js); //--------------------------------------------------------------------------------------- @@ -93,11 +92,11 @@ if (isset($_GET['ReopenedID'])) function safe_exit() { - global $path_to_root; + global $path_to_root, $id; hyperlink_no_params("", _("Enter a &new dimension")); - echo "
"; hyperlink_no_params($path_to_root . "/dimensions/inquiry/search_dimensions.php", _("&Select an existing dimension")); + hyperlink_no_params($path_to_root . "/admin/attachments.php?filterType=40&trans_no=$id", _("&Add Attachment")); display_footer_exit(); } @@ -110,17 +109,8 @@ function can_process() if ($selected_id == -1) { - - 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'], ST_DIMENSION)) + if (!check_reference($_POST['ref'], ST_DIMENSION)) { - display_error(_("The entered reference is already in use.")); set_focus('ref'); return false; } @@ -223,7 +213,7 @@ if (isset($_POST['reopen'])) start_form(); -start_table($table_style2); +start_table(TABLESTYLE2); if ($selected_id != -1) { @@ -265,7 +255,7 @@ if ($selected_id != -1) else { $_POST['dimension_tags'] = array(); - ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION)); + ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION), false, ST_DIMENSION); } text_row_ex(_("Name") . ":", 'name', 50, 75); @@ -307,4 +297,3 @@ end_form(); end_page(); -?>