projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog
[fa-stable.git]
/
inventory
/
prices.php
diff --git
a/inventory/prices.php
b/inventory/prices.php
index c537752ecb4222ff661d729e07238b3d26cd8e80..7132eb624c7fab66153285b2cb4e8c6fd38b9445 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,7
+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");
-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);
//---------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------
@@
-182,10
+186,7
@@
if ($Mode == 'Edit')
}
hidden('selected_id', $selected_id);
}
hidden('selected_id', $selected_id);
-if ($page_nested)
-{
- hidden('popup', @$_GET['popup']);
-}
+
div_start('price_details');
start_table(TABLESTYLE2);
div_start('price_details');
start_table(TABLESTYLE2);
@@
-199,7
+200,8
@@
if (!isset($_POST['price'])) {
}
$kit = get_item_code_dflts($_POST['stock_id']);
}
$kit = get_item_code_dflts($_POST['stock_id']);
-small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$kit["units"]);
+$units = $kit ? $kit["units"] : '';
+small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$units);
end_table(1);
if ($calculated)
end_table(1);
if ($calculated)