projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Transaction references extended with parametrized patterns, added check_reference...
[fa-stable.git]
/
manufacturing
/
work_order_entry.php
diff --git
a/manufacturing/work_order_entry.php
b/manufacturing/work_order_entry.php
index 4466355d610df8577d2d3133383791537364683e..6a27bfc2eb3df89e845d4cdcb60fdfb7ee3fa107 100644
(file)
--- a/
manufacturing/work_order_entry.php
+++ b/
manufacturing/work_order_entry.php
@@
-15,14
+15,13
@@
$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 . "/manufacturing/includes/manufacturing_db.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
$js = "";
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
$js = "";
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(900, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
$js .= get_js_open_window(900, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
@@
-127,16
+126,8
@@
function can_process()
if (!isset($selected_id))
{
if (!isset($selected_id))
{
- if (!
$Refs->is_valid($_POST['wo_ref']
))
+ if (!
check_reference($_POST['wo_ref'], ST_WORKORDER
))
{
{
- display_error(_("You must enter a reference."));
- set_focus('wo_ref');
- return false;
- }
-
- if (!is_new_reference($_POST['wo_ref'], ST_WORKORDER))
- {
- display_error(_("The entered reference is already in use."));
set_focus('wo_ref');
return false;
}
set_focus('wo_ref');
return false;
}
@@
-381,7
+372,7
@@
if (isset($selected_id))
else
{
$_POST['units_issued'] = $_POST['released'] = 0;
else
{
$_POST['units_issued'] = $_POST['released'] = 0;
- ref_row(_("Reference:"), 'wo_ref', '', $Refs->get_next(ST_WORKORDER
)
);
+ ref_row(_("Reference:"), 'wo_ref', '', $Refs->get_next(ST_WORKORDER
, null, get_post('date_')), false, ST_WORKORDER
);
wo_types_list_row(_("Type:"), 'type', null);
}
wo_types_list_row(_("Type:"), 'type', null);
}
@@
-471,4
+462,3
@@
else
end_form();
end_page();
end_form();
end_page();
-?>
\ No newline at end of file