projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bad balance in GL trans for chart en_US-demo.sql
[fa-stable.git]
/
inventory
/
manage
/
items.php
diff --git
a/inventory/manage/items.php
b/inventory/manage/items.php
index f842065b56c9ef187212461663be27ebf5383e6c..99091defdf6dcf9ee32be7255be0a889c10422fc 100644
(file)
--- a/
inventory/manage/items.php
+++ b/
inventory/manage/items.php
@@
-13,29
+13,23
@@
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 =
(!isset($_POST['stock_id']) || $_POST['stock_id'] == "")
;
+$new_item =
get_post('stock_id')==''
;
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
{
//------------------------------------------------------------------------------------
if (isset($_GET['stock_id']))
{
- $stock_id = strtoupper($_GET['stock_id']);
+ $
_POST['stock_id'] = $
stock_id = strtoupper($_GET['stock_id']);
}
else if (isset($_POST['stock_id']))
{
$stock_id = strtoupper($_POST['stock_id']);
}
}
else if (isset($_POST['stock_id']))
{
$stock_id = strtoupper($_POST['stock_id']);
}
-if(get_post('_stock_id_update')) {
- $_POST['NewStockID'] = $_POST['stock_id'];
- if ($new_item) {
- clear_data();
- set_focus('NewStockID');
- } else {
- set_focus('description');
- }
+if (list_updated('stock_id')) {
+ $_POST['NewStockID'] = get_post('stock_id');
+ clear_data();
$Ajax->activate('details');
$Ajax->activate('controls');
$Ajax->activate('details');
$Ajax->activate('controls');
-// unset($_POST['New']);
}
$upload_file = "";
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
}
$upload_file = "";
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
@@
-89,8
+83,6
@@
check_db_has_item_tax_types(_("There are no item tax types defined in the system
function clear_data()
{
function clear_data()
{
- global $new_item;
-
unset($_POST['long_description']);
unset($_POST['description']);
unset($_POST['category_id']);
unset($_POST['long_description']);
unset($_POST['description']);
unset($_POST['category_id']);
@@
-100,7
+92,6
@@
function clear_data()
unset($_POST['NewStockID']);
unset($_POST['dimension_id']);
unset($_POST['dimension2_id']);
unset($_POST['NewStockID']);
unset($_POST['dimension_id']);
unset($_POST['dimension2_id']);
- $new_item = true;
}
//------------------------------------------------------------------------------------
}
//------------------------------------------------------------------------------------
@@
-146,7
+137,6
@@
if (isset($_POST['addupdate']))
$_POST['dimension_id'], $_POST['dimension2_id']);
display_notification(_("Item has been updated."));
$_POST['dimension_id'], $_POST['dimension2_id']);
display_notification(_("Item has been updated."));
- set_focus('stock_id');
}
else
{ //it is a NEW part
}
else
{ //it is a NEW part
@@
-160,9
+150,8
@@
if (isset($_POST['addupdate']))
display_notification(_("A new item has been added."));
$_POST['stock_id'] = $_POST['NewStockID'];
display_notification(_("A new item has been added."));
$_POST['stock_id'] = $_POST['NewStockID'];
- $new_item = false;
- set_focus('stock_id');
}
}
+ set_focus('stock_id');
$Ajax->activate('_page_body');
}
}
$Ajax->activate('_page_body');
}
}
@@
-223,14
+212,18
@@
if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
if (file_exists($filename))
unlink($filename);
display_notification(_("Selected item has been deleted."));
if (file_exists($filename))
unlink($filename);
display_notification(_("Selected item has been deleted."));
- $new_item = true;
$_POST['stock_id'] = '';
clear_data();
set_focus('stock_id');
$Ajax->activate('_page_body');
$_POST['stock_id'] = '';
clear_data();
set_focus('stock_id');
$Ajax->activate('_page_body');
-// meta_forward($_SERVER['PHP_SELF']);
}
}
}
}
+//--------------------------------------------------------------------------------------------
+
+if (isset($_POST['select']))
+{
+ context_return(array('stock_id' => $_POST['stock_id']));
+}
//------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------
@@
-242,14
+235,11
@@
if (db_has_stock_items())
start_row();
stock_items_list_cells(_("Select an item:"), 'stock_id', null,
_('New item'), true);
start_row();
stock_items_list_cells(_("Select an item:"), 'stock_id', null,
_('New item'), true);
-// submit_cells('SelectStockItem', _("Edit Item"));
+ $new_item = get_post('stock_id')=='';
end_row();
end_table();
}
end_row();
end_table();
}
-//hyperlink_params($_SERVER['PHP_SELF'], _("Enter a new item"), "New=1");
-//echo "<br>";
-
div_start('details');
start_table("$table_style2 width=40%");
div_start('details');
start_table("$table_style2 width=40%");
@@
-284,9
+274,8
@@
if ($new_item)
}
else
{ // Must be modifying an existing item
}
else
{ // Must be modifying an existing item
+ $_POST['NewStockID'] = $_POST['stock_id'];
- if (!$new_item)
- {
$myrow = get_item($_POST['NewStockID']);
$_POST['long_description'] = $myrow["long_description"];
$myrow = get_item($_POST['NewStockID']);
$_POST['long_description'] = $myrow["long_description"];
@@
-306,7
+295,7
@@
else
label_row(_("Item Code:"),$_POST['NewStockID']);
hidden('NewStockID', $_POST['NewStockID']);
label_row(_("Item Code:"),$_POST['NewStockID']);
hidden('NewStockID', $_POST['NewStockID']);
- }
+ set_focus('description');
}
text_row(_("Name:"), 'description', null, 52, 50);
}
text_row(_("Name:"), 'description', null, 52, 50);
@@
-393,7
+382,7
@@
if (!isset($_POST['NewStockID']) || $new_item)
else
{
submit_center_first('addupdate', _("Update Item"), '', true);
else
{
submit_center_first('addupdate', _("Update Item"), '', true);
-
+ submit_return('select', _("Return"), _("Select this items and return to document entry."), true);
submit_center_last('delete', _("Delete This Item"), '', true);
}
submit_center_last('delete', _("Delete This Item"), '', true);
}