projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup after merge.
[fa-stable.git]
/
inventory
/
inquiry
/
stock_status.php
diff --git
a/inventory/inquiry/stock_status.php
b/inventory/inquiry/stock_status.php
index d3d8781a05836e5e7cd7b87239585b9aba93dd5b..146422fa6bfc5772fa8a924b0f364314901806e9 100644
(file)
--- a/
inventory/inquiry/stock_status.php
+++ b/
inventory/inquiry/stock_status.php
@@
-13,12
+13,10
@@
$page_security = 'SA_ITEMSSTATVIEW';
$path_to_root = "../..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root = "../..";
include_once($path_to_root . "/includes/session.inc");
-if (isset($_GET['stock_id'])){
+page(_($help_context = "Inventory Item Status"));
+
+if (isset($_GET['stock_id']))
$_POST['stock_id'] = $_GET['stock_id'];
$_POST['stock_id'] = $_GET['stock_id'];
- page(_($help_context = "Inventory Item Status"), true);
-} else {
- page(_($help_context = "Inventory Item Status"));
-}
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
@@
-38,8
+36,11
@@
start_form();
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
-echo "<center> " . _("Item:"). " ";
-echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
+if (!$page_nested)
+{
+ echo "<center> " . _("Item:"). " ";
+ echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
+}
echo "<br>";
echo "<hr></center>";
echo "<br>";
echo "<hr></center>";
@@
-58,7
+59,7
@@
if (is_service($mb_flag))
$loc_details = get_loc_details($_POST['stock_id']);
$loc_details = get_loc_details($_POST['stock_id']);
-start_table(
$table_style
);
+start_table(
TABLESTYLE
);
if ($kitset_or_service == true)
{
if ($kitset_or_service == true)
{