X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=f99bc4747c28bcddfe4d052b2ef94de75b80a10f;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=21e2ab7a4283405104bffe4559e65ab31dcd0a76;hpb=f0e1edfccbf3608463c9da99b40f9c65fd298bb3;p=fa-stable.git diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 21e2ab7a..f99bc474 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -32,7 +32,7 @@ else { } -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"); @@ -44,6 +44,16 @@ include_once($path_to_root . "/fixed_assets/includes/fixed_assets_db.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'])) { @@ -224,10 +234,10 @@ if (isset($_POST['addupdate'])) $_POST['tax_type_id'], get_post('units'), get_post('fixed_asset') ? 'F' : get_post('mb_flag'), $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_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'], @@ -245,10 +255,10 @@ if (isset($_POST['addupdate'])) $_POST['long_description'], $_POST['category_id'], $_POST['tax_type_id'], $_POST['units'], get_post('fixed_asset') ? 'F' : get_post('mb_flag'), $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_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.")); @@ -262,6 +272,7 @@ if (isset($_POST['addupdate'])) } if (get_post('clone')) { + set_edit($_POST['stock_id']); // restores data for disabled inputs too unset($_POST['stock_id']); $stock_id = ''; unset($_POST['inactive']); @@ -316,8 +327,18 @@ function item_settings(&$stock_id, $new_item) //------------------------------------------------------------------------------------ if ($new_item) { - text_row(_("Item Code:"), 'NewStockID', null, 21, 20); - + $tmpCodeID=null; + $post_label = null; + if (!empty($SysPrefs->prefs['barcodes_on_stock'])) + { + $post_label = ''; + if (isset($_POST['generateBarcode'])) + { + $tmpCodeID=generateBarcode(); + $_POST['NewStockID'] = $tmpCodeID; + } + } + text_row(_("Item Code:"), 'NewStockID', $tmpCodeID, 21, 20, null, "", $post_label); $_POST['inactive'] = 0; } else @@ -325,37 +346,7 @@ function item_settings(&$stock_id, $new_item) 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['assembly_account'] = $myrow['assembly_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']); @@ -369,7 +360,7 @@ function item_settings(&$stock_id, $new_item) 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']); @@ -380,7 +371,7 @@ function item_settings(&$stock_id, $new_item) $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; $_POST['sales_account'] = $category_record["dflt_sales_act"]; $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; - $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; + $_POST['wip_account'] = $category_record["dflt_wip_act"]; $_POST['dimension_id'] = $category_record["dflt_dim1"]; $_POST['dimension2_id'] = $category_record["dflt_dim2"]; $_POST['no_sale'] = $category_record["dflt_no_sale"]; @@ -391,7 +382,8 @@ function item_settings(&$stock_id, $new_item) $fresh_item = !isset($_POST['NewStockID']) || $new_item || check_usage($_POST['stock_id'],false); - item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); + // show inactive item tax type in selector only if already set. + item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null, !$new_item && item_type_inactive(get_post('tax_type_id'))); if (!get_post('fixed_asset')) stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); @@ -472,7 +464,7 @@ function item_settings(&$stock_id, $new_item) 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']); @@ -486,10 +478,10 @@ function item_settings(&$stock_id, $new_item) } - if (is_manufactured($_POST['mb_flag'])) - gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); + if (is_manufactured(get_post('mb_flag'))) + gl_all_accounts_list_row(_("WIP Account:"), 'wip_account', $_POST['wip_account']); else - hidden('assembly_account', $_POST['assembly_account']); + hidden('wip_account', $_POST['wip_account']); table_section_title(_("Other")); @@ -530,6 +522,7 @@ function item_settings(&$stock_id, $new_item) end_outer_table(1); div_start('controls'); + if (@$_REQUEST['popup']) hidden('popup', 1); if (!isset($_POST['NewStockID']) || $new_item) { submit_center('addupdate', _("Insert New Item"), true, '', 'default'); @@ -539,7 +532,7 @@ function item_settings(&$stock_id, $new_item) submit_center_first('addupdate', _("Update Item"), '', $page_nested ? true : 'default'); submit_return('select', get_post('stock_id'), - _("Select this items and return to document entry."), 'default'); + _("Select this items and return to document entry.")); submit('clone', _("Clone This Item"), true, '', true); submit('delete', _("Delete This Item"), true, '', true); submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel'); @@ -585,12 +578,14 @@ $tabs = (get_post('fixed_asset')) 'movement' => array(_('&Transactions'), $stock_id) ) : array( 'settings' => array(_('&General settings'), $stock_id), - 'sales_pricing' => array(_('S&ales Pricing'), $stock_id), - 'purchase_pricing' => array(_('&Purchasing Pricing'), $stock_id), - 'standard_cost' => array(_('Standard &Costs'), $stock_id), - 'reorder_level' => array(_('&Reorder Levels'), (is_inventory_item($stock_id) ? $stock_id : null)), - 'movement' => array(_('&Transactions'), $stock_id), - 'status' => array(_('&Status'), (is_inventory_item($stock_id) ? $stock_id : null)), + 'sales_pricing' => array(_('S&ales Pricing'), (user_check_access('SA_SALESPRICE') ? $stock_id : null)), + 'purchase_pricing' => array(_('&Purchasing Pricing'), (user_check_access('SA_PURCHASEPRICING') ? $stock_id : null)), + 'standard_cost' => array(_('Standard &Costs'), (user_check_access('SA_STANDARDCOST') ? $stock_id : null)), + 'reorder_level' => array(_('&Reorder Levels'), (is_inventory_item($stock_id) && + user_check_access('SA_REORDER') ? $stock_id : null)), + 'movement' => array(_('&Transactions'), (user_check_access('SA_ITEMSTRANSVIEW') && is_inventory_item($stock_id) ? + $stock_id : null)), + 'status' => array(_('&Status'), (user_check_access('SA_ITEMSSTATVIEW') ? $stock_id : null)), ); tabbed_content_start('tabs', $tabs); @@ -617,14 +612,14 @@ tabbed_content_start('tabs', $tabs); break; case 'reorder_level': if (!is_inventory_item($stock_id)) - { break; - } $_GET['page_level'] = 1; $_GET['stock_id'] = $stock_id; include_once($path_to_root."/inventory/reorder_level.php"); break; case 'movement': + if (!is_inventory_item($stock_id)) + break; $_GET['stock_id'] = $stock_id; include_once($path_to_root."/inventory/inquiry/stock_movements.php"); break; @@ -648,4 +643,42 @@ end_form(); //------------------------------------------------------------------------------------ -end_page(); +end_page(@$_REQUEST['popup']); + +function generateBarcode() { + $tmpBarcodeID = ""; + $tmpCountTrys = 0; + while ($tmpBarcodeID == "") { + srand ((double) microtime( )*1000000); + $random_1 = rand(1,9); + $random_2 = rand(0,9); + $random_3 = rand(0,9); + $random_4 = rand(0,9); + $random_5 = rand(0,9); + $random_6 = rand(0,9); + $random_7 = rand(0,9); + //$random_8 = rand(0,9); + + // http://stackoverflow.com/questions/1136642/ean-8-how-to-calculate-checksum-digit + $sum1 = $random_2 + $random_4 + $random_6; + $sum2 = 3 * ($random_1 + $random_3 + $random_5 + $random_7 ); + $checksum_value = $sum1 + $sum2; + + $checksum_digit = 10 - ($checksum_value % 10); + if ($checksum_digit == 10) + $checksum_digit = 0; + + $random_8 = $checksum_digit; + + $tmpBarcodeID = $random_1 . $random_2 . $random_3 . $random_4 . $random_5 . $random_6 . $random_7 . $random_8; + + // LETS CHECK TO SEE IF THIS NUMBER HAS EVER BEEN USED + $query = "SELECT stock_id FROM ".TB_PREF."stock_master WHERE stock_id='" . $tmpBarcodeID . "'"; + $arr_stock = db_fetch(db_query($query)); + + if ( !$arr_stock['stock_id'] ) { + return $tmpBarcodeID; + } + $tmpBarcodeID = ""; + } +}