projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.4.8
[fa-stable.git]
/
inventory
/
prices.php
diff --git
a/inventory/prices.php
b/inventory/prices.php
index f1c63c40b2b9a52f273a4f84e5495586754678d1..70dd97d8a39f4a4639fb885e12ff714e0ad32899 100644
(file)
--- a/
inventory/prices.php
+++ b/
inventory/prices.php
@@
-10,10
+10,11
@@
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
$page_security = 'SA_SALESPRICE';
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
$page_security = 'SA_SALESPRICE';
-if (!@$_GET['popup'])
- $path_to_root = "..";
-else
+
+if (@$_GET['page_level'] == 1)
$path_to_root = "../..";
$path_to_root = "../..";
+else
+ $path_to_root = "..";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
@@
-22,8
+23,10
@@
include_once($path_to_root . "/includes/ui.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");
-if (!@$_GET['popup'])
- page(_($help_context = "Inventory Item Sales prices"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+ $js .= get_js_open_window(900, 500);
+page(_($help_context = "Inventory Item Sales prices"), false, false, "", $js);
//---------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------
@@
-50,16
+53,15
@@
if (!isset($_POST['curr_abrev']))
}
//---------------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------------
-
$action = $_SERVER['PHP_SELF'];
$action = $_SERVER['PHP_SELF'];
-if (
@$_GET['popup']
)
+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();
$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 (!
@$_GET['popup']
)
+if (!
$page_nested
)
{
echo "<center>" . _("Item:"). " ";
echo sales_items_list('stock_id', $_POST['stock_id'], false, true, '', array('editable' => false));
{
echo "<center>" . _("Item:"). " ";
echo sales_items_list('stock_id', $_POST['stock_id'], false, true, '', array('editable' => false));
@@
-144,7
+146,7
@@
if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) || isset($_P
$prices_list = get_prices($_POST['stock_id']);
div_start('price_table');
$prices_list = get_prices($_POST['stock_id']);
div_start('price_table');
-start_table(TABLESTYLE, "width=
30%
");
+start_table(TABLESTYLE, "width=
'30%'
");
$th = array(_("Currency"), _("Sales Type"), _("Price"), "", "");
table_header($th);
$th = array(_("Currency"), _("Sales Type"), _("Price"), "", "");
table_header($th);
@@
-184,11
+186,7
@@
if ($Mode == 'Edit')
}
hidden('selected_id', $selected_id);
}
hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
-{
- hidden('_tabs_sel', get_post('_tabs_sel'));
- hidden('popup', @$_GET['popup']);
-}
+
div_start('price_details');
start_table(TABLESTYLE2);
div_start('price_details');
start_table(TABLESTYLE2);
@@
-212,6
+210,4
@@
submit_add_or_update_center($selected_id == -1, '', 'both');
div_end();
end_form();
div_end();
end_form();
-if (!@$_GET['popup'])
- end_page(@$_GET['popup'], false, false);
-?>
+end_page();