projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4946: Inserting a supplier without the short name resets the whole form. Fixed.
[fa-stable.git]
/
inventory
/
inquiry
/
stock_status.php
diff --git
a/inventory/inquiry/stock_status.php
b/inventory/inquiry/stock_status.php
index 1ccbca0db1d0273e3a1e5fc7a13ff48486b4803e..b83c6038e4c63d6f448986d25f2798d1039f2421 100644
(file)
--- a/
inventory/inquiry/stock_status.php
+++ b/
inventory/inquiry/stock_status.php
@@
-13,19
+13,21
@@
$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'])){
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+ $js .= get_js_open_window(900, 500);
+
+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"));
-}
+
+page(_($help_context = "Inventory Item Status"), isset($_GET['stock_id']), false, "", $js);
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");
-include_once($path_to_root . "/includes/manufacturing.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
+include_once($path_to_root . "/includes/db/manufacturing_db.inc");
if (list_updated('stock_id'))
$Ajax->activate('status_tbl');
if (list_updated('stock_id'))
$Ajax->activate('status_tbl');
@@
-38,8
+40,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>";
@@
-118,4
+123,3
@@
div_end();
end_form();
end_page();
end_form();
end_page();
-?>