projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed upgrade procedures (obsolete columns dropped in post_install phase), restored...
[fa-stable.git]
/
inventory
/
purchasing_data.php
diff --git
a/inventory/purchasing_data.php
b/inventory/purchasing_data.php
index 96b205e076ee93b383f27c2d00782951bf6d8d6f..676540f7e753ce15bcc12b1b1f579d2018b3059c 100644
(file)
--- a/
inventory/purchasing_data.php
+++ b/
inventory/purchasing_data.php
@@
-18,11
+18,9
@@
else
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/session.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 . "/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
+104,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
+194,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
+226,5
@@
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();