projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to hotkey system.
[fa-stable.git]
/
inventory
/
manage
/
items.php
diff --git
a/inventory/manage/items.php
b/inventory/manage/items.php
index de0261b710216f4887febae785d2a57d31728f36..dbd25cd3caa60022865a28ad5991c64d7cf9307e 100644
(file)
--- a/
inventory/manage/items.php
+++ b/
inventory/manage/items.php
@@
-22,7
+22,7
@@
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
$user_comp = user_company();
include_once($path_to_root . "/inventory/includes/inventory_db.inc");
$user_comp = user_company();
-$new_item = get_post('stock_id')=='';
+$new_item = get_post('stock_id')==''
|| get_post('cancel')
;
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
@@
-40,6
+40,14
@@
if (list_updated('stock_id')) {
$Ajax->activate('details');
$Ajax->activate('controls');
}
$Ajax->activate('details');
$Ajax->activate('controls');
}
+
+if (get_post('cancel')) {
+ $_POST['NewStockID'] = $_POST['stock_id'] = '';
+ clear_data();
+ set_focus('stock_id');
+ $Ajax->activate('_page_body');
+}
+
if (list_updated('category_id') || list_updated('mb_flag')) {
$Ajax->activate('details');
}
if (list_updated('category_id') || list_updated('mb_flag')) {
$Ajax->activate('details');
}
@@
-412,9
+420,11
@@
if (!isset($_POST['NewStockID']) || $new_item)
}
else
{
}
else
{
- submit_center_first('addupdate', _("Update Item"), '', 'default');
+ submit_center_first('addupdate', _("Update Item"), '',
+ count($_SESSION['Context']) ? true : 'default');
submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default');
submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default');
- submit_center_last('delete', _("Delete This Item"), '', true);
+ submit('delete', _("Delete This Item"), true, '', true);
+ submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
}
div_end();
}
div_end();