From: Janusz Dobrowolski Date: Sun, 5 Apr 2015 21:28:29 +0000 (+0200) Subject: Inventory Adjustment: removed movement type, cleanups. X-Git-Tag: v2.4.2~19^2~217 X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=fd11a3b500e79a3e98f7a3860f872cd31ce33113 Inventory Adjustment: removed movement type, cleanups. --- diff --git a/doc/api_changes.txt b/doc/api_changes.txt index c0053195..dca83c27 100644 --- a/doc/api_changes.txt +++ b/doc/api_changes.txt @@ -20,6 +20,8 @@ Changed functions: add_stock_move_customer() removed items_transfer_db.inc: add_stock_transfer($Items, $location_from, $location_to, $date_, $reference, $memo_) + items_adjust_db.inc: + add_stock_adjustment($items, $location, $date_, $increase, $reference, $memo_) Before 2.4: get_tax_type_default_rate($type_id) @@ -107,3 +109,10 @@ Now: add_stock_transfer($Items, $location_from, $location_to, $date_, $reference, $memo_) Description: Removed obsolete $type argument. + +Before 2.4: + add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_) +Now: + add_stock_adjustment($items, $location, $date_, $increase, $reference, $memo_) +Description: + Removed obsolete $type argument. diff --git a/inventory/adjustments.php b/inventory/adjustments.php index 7ed4b605..bacfa377 100644 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@ -31,8 +31,6 @@ page(_($help_context = "Item Adjustments Note"), false, false, "", $js); check_db_has_costable_items(_("There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured).")); -check_db_has_movement_types(_("There are no inventory movement types defined in the system. Please define at least one inventory adjustment type.")); - //----------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -134,7 +132,7 @@ function can_process() if (isset($_POST['Process']) && can_process()){ $trans_no = add_stock_adjustment($_SESSION['adj_items']->line_items, - $_POST['StockLocation'], $_POST['AdjDate'], $_POST['type'], $_POST['Increase'], + $_POST['StockLocation'], $_POST['AdjDate'], $_POST['Increase'], $_POST['ref'], $_POST['memo_']); new_doc_date($_POST['AdjDate']); $_SESSION['adj_items']->clear_items(); @@ -148,7 +146,7 @@ if (isset($_POST['Process']) && can_process()){ function check_item_data() { - if (!check_num('qty',0)) + if (!check_num('qty',0) || input_num('qty') == 0) { display_error(_("The quantity entered is negative or invalid.")); set_focus('qty'); @@ -169,12 +167,9 @@ function check_item_data() function handle_update_item() { - if($_POST['UpdateItem'] != "" && check_item_data()) - { - $id = $_POST['LineNo']; - $_SESSION['adj_items']->update_cart_item($id, input_num('qty'), - input_num('std_cost')); - } + $id = $_POST['LineNo']; + $_SESSION['adj_items']->update_cart_item($id, input_num('qty'), + input_num('std_cost')); line_start_focus(); } @@ -190,9 +185,6 @@ function handle_delete_item($id) function handle_new_item() { - if (!check_item_data()) - return; - add_to_order($_SESSION['adj_items'], $_POST['stock_id'], input_num('qty'), input_num('std_cost')); line_start_focus(); @@ -203,10 +195,10 @@ $id = find_submit('Delete'); if ($id != -1) handle_delete_item($id); -if (isset($_POST['AddItem'])) +if (isset($_POST['AddItem']) && check_item_data()) handle_new_item(); -if (isset($_POST['UpdateItem'])) +if (isset($_POST['UpdateItem']) && check_item_data()) handle_update_item(); if (isset($_POST['CancelItemChanges'])) { diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index 885ea208..ce108d62 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -9,15 +9,14 @@ 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_, $increase, $reference, $memo_) { global $SysPrefs, $path_to_root, $Refs; begin_transaction(); $args = func_get_args(); - $args = (object)array_combine(array('items', 'location', 'date_', 'type', 'increase', + $args = (object)array_combine(array('items', 'location', 'date_', 'increase', 'reference', 'memo_'), $args); $args->trans_no = 0; hook_db_prewrite($args, ST_INVADJUST); @@ -41,7 +40,7 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe if (!$increase) $line_item->quantity = -$line_item->quantity; - 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_); } @@ -84,7 +83,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); @@ -94,39 +93,6 @@ 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(ST_INVADJUST, $stock_id, $adj_id, $location, @@ -143,6 +109,3 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity)); } } - -//------------------------------------------------------------------------------------------------------------- - diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index a492e792..bed25415 100644 --- a/inventory/includes/item_adjustments_ui.inc +++ b/inventory/includes/item_adjustments_ui.inc @@ -32,15 +32,10 @@ function display_order_header(&$order) table_section(1); locations_list_row(_("Location:"), 'StockLocation', null); - ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST)); - - table_section(2, "33%"); - date_row(_("Date:"), 'AdjDate', '', true); - table_section(3, "33%"); - - movement_types_list_row(_("Detail:"), 'type', null); + table_section(2, "50%"); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST)); if (!isset($_POST['Increase'])) $_POST['Increase'] = 1; diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php index c85eda14..bfa71de9 100644 --- a/inventory/view/view_adjustment.php +++ b/inventory/view/view_adjustment.php @@ -36,14 +36,12 @@ while ($adjustment = db_fetch($adjustment_items)) if (!$header_shown) { - $adjustment_type = get_movement_type($adjustment['person_id']) ; start_table(TABLESTYLE2, "width='90%'"); start_row(); label_cells(_("At Location"), $adjustment['location_name'], "class='tableheader2'"); label_cells(_("Reference"), $adjustment['reference'], "class='tableheader2'", "colspan=6"); label_cells(_("Date"), sql2date($adjustment['tran_date']), "class='tableheader2'"); - label_cells(_("Adjustment Type"), $adjustment_type['name'], "class='tableheader2'"); end_row(); comments_display_row(ST_INVADJUST, $trans_no);