projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0001503: Request - fee account included in bank account table
[fa-stable.git]
/
manufacturing
/
work_order_issue.php
diff --git
a/manufacturing/work_order_issue.php
b/manufacturing/work_order_issue.php
index e0349bb8c0ce3cd440146bde1f04c01d3026644a..b5d6e4cc1f0058d6d264f1780b6039a1154fbcaf 100644
(file)
--- a/
manufacturing/work_order_issue.php
+++ b/
manufacturing/work_order_issue.php
@@
-11,6
+11,7
@@
***********************************************************************/
$page_security = 'SA_MANUFISSUE';
$path_to_root = "..";
***********************************************************************/
$page_security = 'SA_MANUFISSUE';
$path_to_root = "..";
+
include_once($path_to_root . "/includes/ui/items_cart.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/ui/items_cart.inc");
include_once($path_to_root . "/includes/session.inc");
@@
-26,15
+27,19
@@
if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Issue Items to Work Order"), false, false, "", $js);
+
+page(_($help_context = "Issue Items to Work Order"), false, false, "", $js);
//-----------------------------------------------------------------------------------------------
if (isset($_GET['AddedID']))
{
//-----------------------------------------------------------------------------------------------
if (isset($_GET['AddedID']))
{
+ $id = $_GET['AddedID'];
display_notification(_("The work order issue has been entered."));
display_notification(_("The work order issue has been entered."));
- display_note(get_trans_view_str(ST_WORKORDER, $_GET['AddedID'], _("View this Work Order")));
+ display_note(get_trans_view_str(ST_WORKORDER, $id, _("View this Work Order")));
+
+ display_note(get_gl_view_str(ST_WORKORDER, $id, _("View the GL Journal Entries for this Work Order")), 1);
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"));
@@
-59,14
+64,11
@@
function handle_new_order()
unset ($_SESSION['issue_items']);
}
unset ($_SESSION['issue_items']);
}
- Session_register("issue_items");
-
- $_SESSION['issue_items'] = new items_cart(28);
+ $_SESSION['issue_items'] = new items_cart(ST_MANUISSUE);
$_SESSION['issue_items']->order_id = $_GET['trans_no'];
}
//-----------------------------------------------------------------------------------------------
$_SESSION['issue_items']->order_id = $_GET['trans_no'];
}
//-----------------------------------------------------------------------------------------------
-
function can_process()
{
global $Refs;
function can_process()
{
global $Refs;
@@
-79,7
+81,7
@@
function can_process()
}
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
out of fiscal year or is closed for further data entry
."));
set_focus('date_');
return false;
}
set_focus('date_');
return false;
}
@@
-90,7
+92,7
@@
function can_process()
return false;
}
return false;
}
- if (!is_new_reference($_POST['ref'],
28
))
+ if (!is_new_reference($_POST['ref'],
ST_MANUISSUE
))
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
@@
-100,8
+102,9
@@
function can_process()
$failed_item = $_SESSION['issue_items']->check_qoh($_POST['Location'], $_POST['date_'], !$_POST['IssueType']);
if ($failed_item != -1)
{
$failed_item = $_SESSION['issue_items']->check_qoh($_POST['Location'], $_POST['date_'], !$_POST['IssueType']);
if ($failed_item != -1)
{
+ $item = $_SESSION['issue_items']->line_items[$failed_item];
display_error( _("The issue cannot be processed because an entered item would cause a negative inventory balance :") .
display_error( _("The issue cannot be processed because an entered item would cause a negative inventory balance :") .
- " " . $
failed_item->stock_id . " - " . $failed_
item->item_description);
+ " " . $
item->stock_id . " - " . $
item->item_description);
return false;
}
return false;
}
@@
-133,7
+136,7
@@
if (isset($_POST['Process']) && can_process())
function check_item_data()
{
function check_item_data()
{
- if (!check_num('qty', 0))
+ if (
input_num('qty') == 0 ||
!check_num('qty', 0))
{
display_error(_("The quantity entered is negative or invalid."));
set_focus('qty');
{
display_error(_("The quantity entered is negative or invalid."));
set_focus('qty');
@@
-211,7
+214,7
@@
echo "<br>";
start_form();
start_form();
-start_table(
"$table_style
width=90%", 10);
+start_table(
TABLESTYLE, "
width=90%", 10);
echo "<tr><td>";
display_issue_items(_("Items to Issue"), $_SESSION['issue_items']);
issue_options_controls();
echo "<tr><td>";
display_issue_items(_("Items to Issue"), $_SESSION['issue_items']);
issue_options_controls();