X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_adjust_db.inc;h=7dc541032cf69ad9e3890fd6d2307e326bdf19cd;hb=dab9179f6d090c402dc4bf926cfd62a7879032bc;hp=57f74bb53b8f8376db783ae2f5dd20fd5f83755d;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index 57f74bb5..7dc54103 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -9,29 +9,52 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//------------------------------------------------------------------------------------------------------------- -function add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_) +function add_stock_adjustment($items, $location, $date_, $reference, $memo_) { + global $SysPrefs, $path_to_root, $Refs; + begin_transaction(); + $args = func_get_args(); + $args = (object)array_combine(array('items', 'location', 'date_', 'reference', 'memo_'), $args); + $args->trans_no = 0; + hook_db_prewrite($args, ST_INVADJUST); - $adj_id = get_next_trans_no(systypes::inventory_adjustment()); + $adj_id = get_next_trans_no(ST_INVADJUST); + if ($SysPrefs->loc_notification() == 1) + { + include_once($path_to_root . "/inventory/includes/inventory_db.inc"); + $st_ids = array(); + $st_names = array(); + $st_num = array(); + $st_reorder = array(); + } foreach ($items as $line_item) { - if (!$increase) - $line_item->quantity = -$line_item->quantity; + if ($SysPrefs->loc_notification() == 1 && $line_item->quantity < 0) + { + $tmp = $line_item->quantity; + $line_item->quantity = -$line_item->quantity; // calculate_reorder_level expect positive qty + $loc = calculate_reorder_level($location, $line_item, $st_ids, $st_names, $st_num, $st_reorder); + $line_item->quantity = $tmp; + } - add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $type, $reference, + add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $reference, $line_item->quantity, $line_item->standard_cost, $memo_); } - add_comments(systypes::inventory_adjustment(), $adj_id, $date_, $memo_); + add_comments(ST_INVADJUST, $adj_id, $date_, $memo_); - references::save_last($reference, systypes::inventory_adjustment()); + $Refs->save(ST_INVADJUST, $adj_id, $reference); + add_audit_trail(ST_INVADJUST, $adj_id, $date_); + $args->trans_no = $adj_id; + hook_db_postwrite($args, ST_INVADJUST); commit_transaction(); + if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0) + send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder); return $adj_id; } @@ -40,15 +63,16 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe function void_stock_adjustment($type_no) { - void_gl_trans(systypes::inventory_adjustment(), $type_no); - void_stock_move(systypes::inventory_adjustment(), $type_no); + hook_db_prevoid(ST_INVADJUST, $type_no); + void_gl_trans(ST_INVADJUST, $type_no); + void_stock_move(ST_INVADJUST, $type_no); } //------------------------------------------------------------------------------------------------------------- function get_stock_adjustment_items($trans_no) { - $result = get_stock_moves(systypes::inventory_adjustment(), $trans_no); + $result = get_stock_moves(ST_INVADJUST, $trans_no); if (db_num_rows($result) == 0) { @@ -60,7 +84,7 @@ function get_stock_adjustment_items($trans_no) //-------------------------------------------------------------------------------------------------- -function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, $reference, +function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference, $quantity, $standard_cost, $memo_) { $mb_flag = get_mb_flag($stock_id); @@ -72,21 +96,39 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_); - add_stock_move(systypes::inventory_adjustment(), $stock_id, $adj_id, $location, - $date_, $reference, $quantity, $standard_cost, $type); + if (is_fixed_asset($mb_flag)) { + $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1 + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The inactive flag for the fixed asset could not be updated"); + } + + add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location, + $date_, $reference, $quantity, $standard_cost); + + $inv_value = $standard_cost * $quantity; + $adj_value = $standard_cost * -($quantity); - if ($standard_cost > 0) + if (is_fixed_asset($mb_flag)) { + // get the initial value of the fixed assset. + $row = get_fixed_asset_move($stock_id, ST_SUPPRECEIVE); + $inv_value = $row['price'] * $quantity; + $adj_value = (-($row['price']) + $standard_cost) * $quantity; + } + + if ($standard_cost > 0 || is_fixed_asset($mb_flag)) { $stock_gl_codes = get_stock_gl_code($stock_id); - add_gl_trans_std_cost(systypes::inventory_adjustment(), $adj_id, $date_, - $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, ($standard_cost * -($quantity))); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, + $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $adj_value ); - add_gl_trans_std_cost(systypes::inventory_adjustment(), $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity)); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, $inv_value); } -} -//------------------------------------------------------------------------------------------------------------- - -?> \ No newline at end of file + if (is_fixed_asset($mb_flag)) { + // Additional gl entry for fixed asset. + $grn_act = get_company_pref('default_loss_on_asset_disposal_act'); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($standard_cost * -($quantity))); + } +}