X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=352a2fbf6e028b925b529108b1b08015a49ef711;hb=3178545262f658085cb8a250a2195246e05c8213;hp=a897b9cbd10115fbe7ed8ab7794ee0e707435367;hpb=6c49d8128f2a5f33efbe57a8c9d0fff87c54784d;p=fa-stable.git diff --git a/inventory/manage/items.php b/inventory/manage/items.php index a897b9cb..352a2fbf 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -237,8 +237,8 @@ if (isset($_POST['addupdate'])) $_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('fa_class_id')); + get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start', null), + get_post('fa_class_id'), get_post('vat_category')); update_record_status($_POST['NewStockID'], $_POST['inactive'], 'stock_master', 'stock_id'); @@ -258,8 +258,8 @@ if (isset($_POST['addupdate'])) $_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('fa_class_id')); + get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start', null), + get_post('fa_class_id'), get_post('vat_category')); display_notification(_("A new item has been added.")); $_POST['stock_id'] = $_POST['NewStockID'] = @@ -314,6 +314,44 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) } } +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 = ""; + } +} + function item_settings(&$stock_id, $new_item) { global $SysPrefs, $path_to_root, $page_nested, $depreciation_methods; @@ -390,6 +428,8 @@ function item_settings(&$stock_id, $new_item) stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); + vat_category_list_row(_("VAT category:"), 'vat_category', null, $fresh_item, false, !$new_item); + check_row(_("Editable description:"), 'editable'); if (get_post('fixed_asset')) @@ -464,7 +504,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']); @@ -478,7 +518,7 @@ function item_settings(&$stock_id, $new_item) } - 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']); @@ -580,7 +620,7 @@ $tabs = (get_post('fixed_asset')) 'settings' => array(_('&General settings'), $stock_id), '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)), + 'unit_cost' => array(_('Unit &Cost'), (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) ? @@ -605,7 +645,7 @@ tabbed_content_start('tabs', $tabs); $_GET['page_level'] = 1; include_once($path_to_root."/inventory/purchasing_data.php"); break; - case 'standard_cost': + case 'unit_cost': $_GET['stock_id'] = $stock_id; $_GET['page_level'] = 1; include_once($path_to_root."/inventory/cost_update.php"); @@ -641,44 +681,4 @@ if (get_post('fixed_asset')) end_form(); -//------------------------------------------------------------------------------------ - end_page(); - -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 = ""; - } -}