X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_issues_db.inc;h=b055aac5347a401a53c632e7ce29b471208f04e1;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=ca2f4a86883b5d213f556cc460a5c738b3b41275;hpb=6d65fde699a327a6fee0d8d46abf8d2b37e53947;p=fa-stable.git diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc index ca2f4a86..b055aac5 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -70,13 +70,13 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w $issue_cost = $standard_cost * $item->quantity; $issue = get_stock_gl_code($item->stock_id); $stockitem = get_item($item->stock_id); - + //Chaitanya : Compatibility for Service Items if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else $ivaccount = $issue["cogs_account"]; - + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost); $issue_total += $issue_cost; @@ -166,7 +166,7 @@ function void_work_order_issue($type_no) { begin_transaction(); hook_db_prevoid(ST_MANUISSUE, $type_no); - + //Chaitanya : Skip processing already voided entry i.e. explicitly voided $void_entry = get_voided_entry(ST_MANUISSUE, $type_no); if ($void_entry) @@ -186,7 +186,7 @@ function void_work_order_issue($type_no) $manf_stock_id = $issue["stock_id"]; $date_ = sql2date($issue["issue_date"]); $woid = $issue["workorder_id"]; - + $result = get_stock_moves(ST_MANUISSUE, $type_no); $total_cost = 0; $issue_total = 0; @@ -195,18 +195,18 @@ function void_work_order_issue($type_no) $issue_cost = $myrow["qty"]*$myrow["standard_cost"]; $issue = get_stock_gl_code($myrow["stock_id"]); $stockitem = get_item($myrow["stock_id"]); - + //Chaitanya : Compatibility for Service Items if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["cogs_account"]; - + $ivaccount = $issue["cogs_account"]; + if ($issue_cost != 0) { $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, $date_.": "._("Reversed the issue of")." ".$stockitem["description"], - -$issue_cost); + -$issue_cost); $issue_total += $issue_cost; } } @@ -219,14 +219,13 @@ function void_work_order_issue($type_no) add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0, $date_.": "._("Reversed the issue to")." ".$stockitem["description"], -$total_cost); - + //Chaitanya : Shifted below void all related stock moves void_stock_move(ST_MANUISSUE, $type_no); - + commit_transaction(); } //-------------------------------------------------------------------------------------- -?> \ No newline at end of file