if (isset($_GET['FixedAsset'])) {
$page_security = 'SA_ASSET';
- $_SESSION['page_title'] = _($help_context = "FA Items");
+ $_SESSION['page_title'] = _($help_context = "Fixed Assets");
$_POST['mb_flag'] = 'F';
$_POST['fixed_asset'] = 1;
}
unset($_POST['no_purchase']);
unset($_POST['depreciation_method']);
unset($_POST['depreciation_rate']);
+ unset($_POST['depreciation_factor']);
unset($_POST['depreciation_start']);
}
$_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'), get_post('depreciation_rate'), get_post('depreciation_start'),
+ get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'),
get_post('fa_class_id'));
update_record_status($_POST['NewStockID'], $_POST['inactive'],
$_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'), get_post('depreciation_rate'), get_post('depreciation_start'),
+ get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'),
get_post('fa_class_id'));
display_notification(_("A new item has been added."));
$_POST['mb_flag'] = $myrow["mb_flag"];
$_POST['depreciation_method'] = $myrow['depreciation_method'];
- $_POST['depreciation_rate'] = $myrow['depreciation_rate'];
+ $_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['last_cost'] = $myrow['last_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['wip_account'] = $myrow['wip_account'];
$_POST['dimension_id'] = $myrow['dimension_id'];
$_POST['dimension2_id'] = $myrow['dimension2_id'];
$_POST['no_sale'] = $myrow['no_sale'];
$_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"];
if (!isset($_POST['depreciation_rate']) || (list_updated('fa_class_id') || list_updated('depreciation_method'))) {
$class_row = get_fixed_asset_class($_POST['fa_class_id']);
+ $_POST['depreciation_rate'] = get_post('depreciation_method') == 'N' ? ceil(100/$class_row['depreciation_rate'])
+ : $class_row['depreciation_rate'];
+ }
- if ($_POST['depreciation_method'] == 'S')
- $_POST['depreciation_rate'] = $class_row['depreciation_period'];
- else
- $_POST['depreciation_rate'] = $class_row['depreciation_rate'];
- }
-
- switch ($_POST['depreciation_method']) {
- case 'D':
- small_amount_row(_("Depreciation Rate").':', 'depreciation_rate', null, null, '%', user_percent_dec());
- break;
- case 'S':
- text_row_ex(_("Depreciation Period").':', 'depreciation_rate', 3, 3, '', null, null, _("years"));
- break;
- case 'O':
- hidden('depreciation_rate', 100);
- label_row(_("Depreciation Rate").':', "100 %");
- break;
- }
-
- // do not allow to change the depreciation start after this item has been depreciated
- if ($new_item || $_POST['depreciation_start'] == $_POST['depreciation_date'])
- date_row(_("Depreciation Start").':', 'depreciation_start', null, null, 1 - date('j'));
- else {
- hidden('depreciation_start');
- label_row(_("Depreciation Start").':', $_POST['depreciation_start']);
- label_row(_("Last Depreciation").':', $_POST['depreciation_date']);
- }
- hidden('depreciation_date');
-
+ if ($_POST['depreciation_method'] == 'O')
+ {
+ hidden('depreciation_rate', 100);
+ label_row(_("Depreciation Rate").':', "100 %");
+ }
+ elseif ($_POST['depreciation_method'] == 'N')
+ {
+ small_amount_row(_("Depreciation Years").':', 'depreciation_rate', null, null, _('years'), 0);
+ }
+ elseif ($_POST['depreciation_method'] == 'D')
+ small_amount_row(_("Base Rate").':', 'depreciation_rate', null, null, '%', user_percent_dec());
+ else
+ small_amount_row(_("Depreciation Rate").':', 'depreciation_rate', null, null, '%', user_percent_dec());
+
+ if ($_POST['depreciation_method'] == 'D')
+ small_amount_row(_("Rate multiplier").':', 'depreciation_factor', null, null, '', 2);
+
+ // do not allow to change the depreciation start after this item has been depreciated
+ if ($new_item || $_POST['depreciation_start'] == $_POST['depreciation_date'])
+ date_row(_("Depreciation Start").':', 'depreciation_start', null, null, 1 - date('j'));
+ else {
+ hidden('depreciation_start');
+ label_row(_("Depreciation Start").':', $_POST['depreciation_start']);
+ label_row(_("Last Depreciation").':', $_POST['depreciation_date']==$_POST['depreciation_start'] ? _("None") : $_POST['depreciation_date']);
+ }
+ hidden('depreciation_date');
}
table_section(2);
if (is_manufactured($_POST['mb_flag']))
- gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']);
+ 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"));
table_section_title(_("Values"));
if (!$new_item) {
hidden('material_cost');
- hidden('last_cost');
- label_row(_("Amount").":", price_format($_POST['last_cost']), "", "align='right'");
- label_row(_("Depreciations").":", price_format($_POST['last_cost'] - $_POST['material_cost']), "", "align='right'");
+ hidden('purchase_cost');
+ label_row(_("Initial Value").":", price_format($_POST['purchase_cost']), "", "align='right'");
+ label_row(_("Depreciations").":", price_format($_POST['purchase_cost'] - $_POST['material_cost']), "", "align='right'");
label_row(_("Current Value").':', price_format($_POST['material_cost']), "", "align='right'");
}
}
'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') ? $stock_id : null)),
+ 'status' => array(_('&Status'), $stock_id),
+ //'status' => array(_('&Status'), (user_check_access('SA_ITEMSSTATVIEW') ? $stock_id : null)),
);
tabbed_content_start('tabs', $tabs);
projects / fa-stable.git / blobdiff