}
-page($_SESSION['page_title'], false, false, "", $js);
+page($_SESSION['page_title'], @$_REQUEST['popup'], false, "", $js);
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
$user_comp = user_company();
$new_item = get_post('stock_id')=='' || get_post('cancel') || get_post('clone');
//------------------------------------------------------------------------------------
+function set_edit($stock_id)
+{
+ $_POST = array_merge($_POST, get_item($stock_id));
+
+ $_POST['depreciation_rate'] = number_format2($_POST['depreciation_rate'], 1);
+ $_POST['depreciation_factor'] = number_format2($_POST['depreciation_factor'], 1);
+ $_POST['depreciation_start'] = sql2date($_POST['depreciation_start']);
+ $_POST['depreciation_date'] = sql2date($_POST['depreciation_date']);
+ $_POST['del_image'] = 0;
+}
if (isset($_GET['stock_id']))
{
$_POST['depreciation_rate'] = 0;
}
$move_row = get_fixed_asset_move($_POST['NewStockID'], ST_SUPPRECEIVE);
- if (isset($_POST['depreciation_start']) && strtotime($_POST['depreciation_start']) < strtotime($move_row['tran_date'])) {
+ if ($move_row && isset($_POST['depreciation_start']) && strtotime($_POST['depreciation_start']) < strtotime($move_row['tran_date'])) {
display_warning(_('The depracation cannot start before the fixed asset purchase date'));
}
}
$_POST['adjustment_account'], $_POST['wip_account'],
$_POST['dimension_id'], $_POST['dimension2_id'],
check_value('no_sale'), check_value('editable'), check_value('no_purchase'),
- get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'),
+ get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start', null),
get_post('fa_class_id'));
update_record_status($_POST['NewStockID'], $_POST['inactive'],
$_POST['adjustment_account'], $_POST['wip_account'],
$_POST['dimension_id'], $_POST['dimension2_id'],
check_value('no_sale'), check_value('editable'), check_value('no_purchase'),
- get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'),
+ get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start', null),
get_post('fa_class_id'));
display_notification(_("A new item has been added."));
}
if (get_post('clone')) {
+ set_edit($_POST['stock_id']); // restores data for disabled inputs too
unset($_POST['stock_id']);
$stock_id = '';
unset($_POST['inactive']);
if (get_post('NewStockID') != get_post('stock_id') || get_post('addupdate')) { // first item display
$_POST['NewStockID'] = $_POST['stock_id'];
-
- $myrow = get_item($_POST['NewStockID']);
-
- $_POST['long_description'] = $myrow["long_description"];
- $_POST['description'] = $myrow["description"];
- $_POST['category_id'] = $myrow["category_id"];
- $_POST['tax_type_id'] = $myrow["tax_type_id"];
- $_POST['units'] = $myrow["units"];
- $_POST['mb_flag'] = $myrow["mb_flag"];
-
- $_POST['depreciation_method'] = $myrow['depreciation_method'];
- $_POST['depreciation_rate'] = number_format2($myrow['depreciation_rate'], 1);
- $_POST['depreciation_factor'] = number_format2($myrow['depreciation_factor'], 1);
- $_POST['depreciation_start'] = sql2date($myrow['depreciation_start']);
- $_POST['depreciation_date'] = sql2date($myrow['depreciation_date']);
- $_POST['fa_class_id'] = $myrow['fa_class_id'];
- $_POST['material_cost'] = $myrow['material_cost'];
- $_POST['purchase_cost'] = $myrow['purchase_cost'];
-
- $_POST['sales_account'] = $myrow['sales_account'];
- $_POST['inventory_account'] = $myrow['inventory_account'];
- $_POST['cogs_account'] = $myrow['cogs_account'];
- $_POST['adjustment_account'] = $myrow['adjustment_account'];
- $_POST['wip_account'] = $myrow['wip_account'];
- $_POST['dimension_id'] = $myrow['dimension_id'];
- $_POST['dimension2_id'] = $myrow['dimension2_id'];
- $_POST['no_sale'] = $myrow['no_sale'];
- $_POST['no_purchase'] = $myrow['no_purchase'];
- $_POST['del_image'] = 0;
- $_POST['inactive'] = $myrow["inactive"];
- $_POST['editable'] = $myrow["editable"];
+ set_edit($_POST['stock_id']);
}
label_row(_("Item Code:"),$_POST['NewStockID']);
hidden('NewStockID', $_POST['NewStockID']);
stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item, $fixed_asset);
- if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) {
+ if ($new_item && (list_updated('category_id') || !isset($_POST['sales_account']))) { // changed category for new item or first page view
$category_record = get_item_category($_POST['category_id']);
stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item);
- check_row(_("Editable description:"), 'editable');
- if (get_post('fixed_asset'))
- hidden('no_sale', 0);
- else
+ if (!get_post('fixed_asset')) {
+ check_row(_("Editable description:"), 'editable');
check_row(_("Exclude from sales:"), 'no_sale');
-
- check_row(_("Exclude from purchases:"), 'no_purchase');
+ check_row(_("Exclude from purchases:"), 'no_purchase');
+ }
if (get_post('fixed_asset')) {
table_section_title(_("Depreciation"));
gl_all_accounts_list_row(_("Depreciation cost account:"), 'cogs_account', $_POST['cogs_account']);
gl_all_accounts_list_row(_("Depreciation/Disposal account:"), 'adjustment_account', $_POST['adjustment_account']);
}
- elseif (!is_service($_POST['mb_flag']))
+ elseif (!is_service(get_post('mb_flag')))
{
gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']);
gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']);
}
- if (is_manufactured($_POST['mb_flag']))
+ if (is_manufactured(get_post('mb_flag')))
gl_all_accounts_list_row(_("WIP Account:"), 'wip_account', $_POST['wip_account']);
else
hidden('wip_account', $_POST['wip_account']);
// Add Image upload for New Item - by Joe
$stock_img_link = "";
$check_remove_image = false;
- if (isset($_POST['NewStockID']) && file_exists(company_path().'/images/'
+
+ if (@$_POST['NewStockID'] && file_exists(company_path().'/images/'
.item_img_name($_POST['NewStockID']).".jpg"))
{
// 31/08/08 - rand() call is necessary here to avoid caching problems.
//------------------------------------------------------------------------------------
-end_page();
+end_page(@$_REQUEST['popup']);
function generateBarcode() {
$tmpBarcodeID = "";