projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed session name to avoid conflicts during multiuser debugging.
[fa-stable.git]
/
manufacturing
/
work_order_add_finished.php
diff --git
a/manufacturing/work_order_add_finished.php
b/manufacturing/work_order_add_finished.php
index 2771994a4816859c16bf833f6985782490a99395..dd76e35cd347dec98146d299e447f865ee624855 100644
(file)
--- a/
manufacturing/work_order_add_finished.php
+++ b/
manufacturing/work_order_add_finished.php
@@
-4,8
+4,6
@@
$page_security = 10;
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
-page(_("Produce or Unassemble Finished Items From Work Order"));
-
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/db/inventory_db.inc");
include_once($path_to_root . "/includes/manufacturing.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/db/inventory_db.inc");
include_once($path_to_root . "/includes/manufacturing.inc");
@@
-13,6
+11,13
@@
include_once($path_to_root . "/includes/manufacturing.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.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)
+ $js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+ $js .= get_js_date_picker();
+page(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
+
if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
{
$_POST['selected_id'] = $_GET['trans_no'];
if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
{
$_POST['selected_id'] = $_GET['trans_no'];
@@
-20,12
+25,12
@@
if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
//--------------------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------------------
-if (isset($_GET['AddedID']))
+if (isset($_GET['AddedID']))
{
display_note(_("The manufacturing process has been entered."));
{
display_note(_("The manufacturing process has been entered."));
- hyperlink_no_params("search_work_orders.php", _("Select another Work Order to Process"));
+ hyperlink_no_params("search_work_orders.php", _("Select another
&
Work Order to Process"));
end_page();
exit;
end_page();
exit;
@@
-35,7
+40,7
@@
if (isset($_GET['AddedID']))
$wo_details = get_work_order($_POST['selected_id']);
$wo_details = get_work_order($_POST['selected_id']);
-if (strlen($wo_details[0]) == 0)
+if (strlen($wo_details[0]) == 0)
{
display_error(_("The order number sent is not valid."));
exit;
{
display_error(_("The order number sent is not valid."));
exit;
@@
-47,43
+52,43
@@
function can_process()
{
global $wo_details;
{
global $wo_details;
- if (!references::is_valid($_POST['ref']))
+ if (!references::is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
{
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
return false;
}
- if (!is_new_reference($_POST['ref'], 29))
+ if (!is_new_reference($_POST['ref'], 29))
{
display_error(_("The entered reference is already in use."));
{
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
return false;
}
- if (!
is_numeric($_POST['quantity']
))
+ if (!
check_num('quantity', 0
))
{
{
- display_error(_("The quantity entered is not a valid number."));
- return false;
- }
-
- if ($_POST['quantity'] <= 0)
- {
- display_error(_("The quantity entered must be greater than zero."));
+ display_error(_("The quantity entered is not a valid number or less then zero."));
+ set_focus('quantity');
return false;
}
if (!is_date($_POST['date_']))
{
display_error(_("The entered date is invalid."));
return false;
}
if (!is_date($_POST['date_']))
{
display_error(_("The entered date is invalid."));
+ set_focus('date_');
return false;
return false;
- }
- elseif (!is_date_in_fiscalyear($_POST['date_']))
+ }
+ elseif (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('date_');
return false;
}
return false;
}
- if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
+ if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
{
display_error(_("The production date cannot be before the release date of the work order."));
{
display_error(_("The production date cannot be before the release date of the work order."));
+ set_focus('date_');
return false;
}
return false;
}
@@
-93,9
+98,10
@@
function can_process()
$wo_details = get_work_order($_POST['selected_id']);
$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $date_);
$wo_details = get_work_order($_POST['selected_id']);
$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $date_);
- if (-$_POST['quantity'] + $qoh < 0)
+ if (-$_POST['quantity'] + $qoh < 0)
{
display_error(_("The unassembling cannot be processed because there is insufficient stock."));
{
display_error(_("The unassembling cannot be processed because there is insufficient stock."));
+ set_focus('quantity');
return false;
}
}
return false;
}
}
@@
-105,7
+111,7
@@
function can_process()
//--------------------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------------------
-if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true))
+if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true))
{
$close_wo = 0;
{
$close_wo = 0;
@@
-133,14
+139,14
@@
start_form();
hidden('selected_id', $_POST['selected_id']);
//hidden('WOReqQuantity', $_POST['WOReqQuantity']);
hidden('selected_id', $_POST['selected_id']);
//hidden('WOReqQuantity', $_POST['WOReqQuantity']);
-if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
+if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
{
$_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
}
start_table();
{
$_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
}
start_table();
-ref_row(_("Reference:"), 'ref', references::get_next(29));
+ref_row(_("Reference:"), 'ref',
'',
references::get_next(29));
if (!isset($_POST['ProductionType']))
$_POST['ProductionType'] = 1;
if (!isset($_POST['ProductionType']))
$_POST['ProductionType'] = 1;
@@
-148,7
+154,7
@@
if (!isset($_POST['ProductionType']))
yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
_("Produce Finished Items"), _("Return Items to Work Order"));
yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
_("Produce Finished Items"), _("Return Items to Work Order"));
-
text_row(_("Quantity:"), 'quantity', $_POST['quantity'], 13, 15
);
+
small_qty_row(_("Quantity:"), 'quantity', null, null, null, get_qty_dec($wo_details["stock_id"])
);
date_row(_("Date:"), 'date_');
date_row(_("Date:"), 'date_');
@@
-156,8
+162,8
@@
textarea_row(_("Memo:"), 'memo_', null, 40, 3);
end_table(1);
end_table(1);
-submit_center_first('Process', _("Process"));
-submit_center_last('ProcessAndClose', _("Process And Close Order"));
+submit_center_first('Process', _("Process")
, '', true
);
+submit_center_last('ProcessAndClose', _("Process And Close Order")
, '', true
);
end_form();
end_form();