projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0005170] Fixed Assets Purchase: fixed error on items with long description, removed...
[fa-stable.git]
/
dimensions
/
dimension_entry.php
diff --git
a/dimensions/dimension_entry.php
b/dimensions/dimension_entry.php
index 0777c2a3adc25f106dbb2fcacf0234e37522cbdb..3a11e6656a156fc4141ec047e44a9bce2112ffc2 100644
(file)
--- 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/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");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/admin/db/tags_db.inc");
@@
-22,7
+21,7
@@
include_once($path_to_root . "/dimensions/includes/dimensions_db.inc");
include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
$js = "";
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(_($help_context = "Dimension Entry"), false, false, "", $js);
$js .= get_js_date_picker();
page(_($help_context = "Dimension Entry"), false, false, "", $js);
@@
-93,11
+92,11
@@
if (isset($_GET['ReopenedID']))
function safe_exit()
{
function safe_exit()
{
- global $path_to_root;
+ global $path_to_root
, $id
;
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"));
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();
}
display_footer_exit();
}
@@
-110,17
+109,8
@@
function can_process()
if ($selected_id == -1)
{
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;
}
set_focus('ref');
return false;
}
@@
-223,13
+213,13
@@
if (isset($_POST['reopen']))
start_form();
start_form();
-start_table(
$table_style
2);
+start_table(
TABLESTYLE
2);
if ($selected_id != -1)
{
if ($selected_id != -1)
{
- $myrow = get_dimension($selected_id);
+ $myrow = get_dimension($selected_id
, true
);
- if (
strlen($myrow[0]) == 0
)
+ if (
$myrow === false
)
{
display_error(_("The dimension sent is not valid."));
display_footer_exit();
{
display_error(_("The dimension sent is not valid."));
display_footer_exit();
@@
-265,7
+255,7
@@
if ($selected_id != -1)
else
{
$_POST['dimension_tags'] = array();
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);
}
text_row_ex(_("Name") . ":", 'name', 50, 75);
@@
-307,4
+297,3
@@
end_form();
end_page();
end_page();
-?>