projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun. Changed query_size in users table to unsigned tinyint(1)
[fa-stable.git]
/
inventory
/
purchasing_data.php
diff --git
a/inventory/purchasing_data.php
b/inventory/purchasing_data.php
index d0b1685d8f5e0acbb5134d660aa2468532dab29b..4b7717d546cc90d89a3d1e2219b6ee8f3bbb8376 100644
(file)
--- a/
inventory/purchasing_data.php
+++ b/
inventory/purchasing_data.php
@@
-21,8
+21,7
@@
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 . "/includes/manufacturing.inc");
include_once($path_to_root . "/includes/data_checks.inc");
-if (!@$_GET['popup'])
- page(_($help_context = "Supplier Purchasing Data"));
+page(_($help_context = "Supplier Purchasing Data"));
check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
check_db_has_suppliers(_("There are no suppliers defined in the system."));
check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@
-106,13
+105,15
@@
if (list_updated('stock_id'))
$Ajax->activate('price_table');
//--------------------------------------------------------------------------------------------------
$Ajax->activate('price_table');
//--------------------------------------------------------------------------------------------------
-if (!@$_GET['popup'])
- start_form();
+$action = $_SERVER['PHP_SELF'];
+if ($page_nested)
+ $action .= "?stock_id=".get_post('stock_id');
+start_form(false, false, $action);
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
-if (!
@$_GET['popup']
)
+if (!
$page_nested
)
{
echo "<center>" . _("Item:"). " ";
//Chaitanya : All items can be purchased
{
echo "<center>" . _("Item:"). " ";
//Chaitanya : All items can be purchased
@@
-194,9
+195,8
@@
if ($Mode =='Edit')
br();
hidden('selected_id', $selected_id);
br();
hidden('selected_id', $selected_id);
-if (
@$_GET['popup']
)
+if (
$page_nested
)
{
{
- hidden('_tabs_sel', get_post('_tabs_sel'));
hidden('popup', @$_GET['popup']);
}
hidden('popup', @$_GET['popup']);
}
@@
-227,9
+227,6
@@
end_table(1);
submit_add_or_update_center($selected_id == -1, '', 'both');
submit_add_or_update_center($selected_id == -1, '', 'both');
-if (!@$_GET['popup'])
-{
- end_form();
- end_page(@$_GET['popup'], false, false);
-}
+end_form();
+end_page();
?>
?>