X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_adjust_db.inc;h=f9ecd6f314de160d939ff1969ee42b84e658775a;hb=573087d89471d220b1827c408821d712eba8cf03;hp=c824e003b7657063abe207f408614c7d59fe04a9;hpb=6be063c6b73b820c8100ead12fd865a118b4e0f0;p=fa-stable.git diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index c824e003..f9ecd6f3 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -1,16 +1,43 @@ . +***********************************************************************/ //------------------------------------------------------------------------------------------------------------- function add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_) { + global $loc_notification, $path_to_root, $Refs; + begin_transaction(); + $args = func_get_args(); + $args = (object)array_combine(array('items', 'location', 'date_', 'type', 'increase', + '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 ($loc_notification == 1 && !$increase) + { + 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 ($loc_notification == 1 && !$increase) + $loc = calculate_reorder_level($location, $line_item, $st_ids, $st_names, $st_num, $st_reorder); + if (!$increase) $line_item->quantity = -$line_item->quantity; @@ -18,11 +45,16 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe $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 ($loc_notification == 1 && !$increase && count($st_ids) > 0) + send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder); return $adj_id; } @@ -31,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) { @@ -61,9 +94,42 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, display_db_error("Cannot do inventory adjustment for Service item : $stock_id", ""); } + /* Logic shifted to function update_average_material_cost + //Chaitanya : If negative adjustment result in negative or zero inventory + //then difference should be adjusted + $qoh = get_qoh_on_date($stock_id); + if ($qoh + $quantity <= 0 && $qoh > 0) //Positive inventory turning zero/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + $diff = get_standard_cost($stock_id) - $standard_cost; + + if ($diff !=0) + { + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = _("For zero inventory of ").$stock_id." INVADJ REF: ".$reference; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$qoh * $diff); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $qoh * $diff); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + }*/ + update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_); - add_stock_move(systypes::inventory_adjustment(), $stock_id, $adj_id, $location, + add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location, $date_, $reference, $quantity, $standard_cost, $type); if ($standard_cost > 0) @@ -71,10 +137,10 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, $stock_gl_codes = get_stock_gl_code($stock_id); - add_gl_trans_std_cost(systypes::inventory_adjustment(), $adj_id, $date_, + 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_, ($standard_cost * -($quantity))); - 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_, ($standard_cost * $quantity)); } }